From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
To: Arnaud Patard <apatard@mandriva.com>
Cc: linux-kernel@vger.kernel.org,
Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Subject: [PATCH 1/6] More ifdefery cleanup.
Date: Sun, 6 Jun 2010 01:33:11 +0200 [thread overview]
Message-ID: <1275780796-17751-2-git-send-email-riccardo.magliocchetti@gmail.com> (raw)
In-Reply-To: <1275780796-17751-1-git-send-email-riccardo.magliocchetti@gmail.com>
Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
---
drivers/staging/xgifb/vb_struct.h | 9 ---------
drivers/staging/xgifb/vgatypes.h | 12 ------------
2 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index bb25c0e..1302d8f 100644
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -1,15 +1,6 @@
#ifndef _VB_STRUCT_
#define _VB_STRUCT_
-#ifdef _INITNEW_
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-
-
-
typedef struct _XGI_PanelDelayTblStruct
{
UCHAR timer[2];
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index 7ca84fe..3df7a39 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -74,7 +74,6 @@ typedef unsigned long XGIIOADDRESS;
#define VBIOS_VER_MAX_LENGTH 4
#endif
-#ifndef XGI_VB_CHIP_TYPE
typedef enum _XGI_VB_CHIP_TYPE {
VB_CHIP_Legacy = 0,
VB_CHIP_301,
@@ -88,9 +87,7 @@ typedef enum _XGI_VB_CHIP_TYPE {
VB_CHIP_UNKNOWN, /* other video bridge or no video bridge */
MAX_VB_CHIP
} XGI_VB_CHIP_TYPE;
-#endif
-#ifndef XGI_LCD_TYPE
typedef enum _XGI_LCD_TYPE {
LCD_INVALID = 0,
LCD_320x480, /* FSTN, DSTN */
@@ -116,17 +113,12 @@ typedef enum _XGI_LCD_TYPE {
LCD_CUSTOM,
LCD_UNKNOWN
} XGI_LCD_TYPE;
-#endif
-#ifndef PXGI_DSReg
typedef struct _XGI_DSReg
{
UCHAR jIdx;
UCHAR jVal;
} XGI_DSReg, *PXGI_DSReg;
-#endif
-
-#ifndef XGI_HW_DEVICE_INFO
typedef struct _XGI_HW_DEVICE_INFO XGI_HW_DEVICE_INFO, *PXGI_HW_DEVICE_INFO;
@@ -194,9 +186,6 @@ struct _XGI_HW_DEVICE_INFO
/* end data :(idx, val) = (FF, FF) */
/* Note : restore cR registers if */
/* bSkipDramSizing = TRUE */
-/*
-#endif
-*/
PXGI_QUERYSPACE pQueryVGAConfigSpace;
@@ -205,7 +194,6 @@ struct _XGI_HW_DEVICE_INFO
UCHAR szVBIOSVer[VBIOS_VER_MAX_LENGTH];
};
-#endif
#endif
--
1.7.1
next prev parent reply other threads:[~2010-06-05 23:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 23:33 [PATCH 0/6] [STAGING] More xgifb cleanup Riccardo Magliocchetti
2010-06-05 23:33 ` Riccardo Magliocchetti [this message]
2010-06-05 23:33 ` [PATCH 2/6] kill osdef.h Riccardo Magliocchetti
2010-06-05 23:33 ` [PATCH 3/6] Kill empty function NewDelaySeconds() Riccardo Magliocchetti
2010-06-05 23:33 ` [PATCH 4/6] Kill unused header Riccardo Magliocchetti
2010-06-05 23:33 ` [PATCH 5/6] Kill udelay wrapper Riccardo Magliocchetti
2010-06-05 23:33 ` [PATCH 6/6] Use standard types instead of typedefs Riccardo Magliocchetti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275780796-17751-2-git-send-email-riccardo.magliocchetti@gmail.com \
--to=riccardo.magliocchetti@gmail.com \
--cc=apatard@mandriva.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®