diff options
Diffstat (limited to 'drivers/scsi/FlashPoint.c')
-rw-r--r-- | drivers/scsi/FlashPoint.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c index 88b7da371399..9969fef8fd52 100644 --- a/drivers/scsi/FlashPoint.c +++ b/drivers/scsi/FlashPoint.c | |||
@@ -57,7 +57,7 @@ struct sccb; | |||
57 | typedef void (*CALL_BK_FN)(struct sccb *); | 57 | typedef void (*CALL_BK_FN)(struct sccb *); |
58 | 58 | ||
59 | 59 | ||
60 | typedef struct SCCBMgr_info { | 60 | struct sccb_mgr_info { |
61 | unsigned long si_baseaddr; | 61 | unsigned long si_baseaddr; |
62 | unsigned char si_present; | 62 | unsigned char si_present; |
63 | unsigned char si_intvect; | 63 | unsigned char si_intvect; |
@@ -79,9 +79,8 @@ typedef struct SCCBMgr_info { | |||
79 | unsigned char si_XlatInfo[4]; | 79 | unsigned char si_XlatInfo[4]; |
80 | unsigned long si_reserved2[5]; | 80 | unsigned long si_reserved2[5]; |
81 | unsigned long si_secondary_range; | 81 | unsigned long si_secondary_range; |
82 | } SCCBMGR_INFO; | 82 | }; |
83 | 83 | ||
84 | typedef SCCBMGR_INFO * PSCCBMGR_INFO; | ||
85 | 84 | ||
86 | 85 | ||
87 | #define SCSI_PARITY_ENA 0x0001 | 86 | #define SCSI_PARITY_ENA 0x0001 |
@@ -309,7 +308,7 @@ typedef NVRAMINFO *PNVRamInfo; | |||
309 | 308 | ||
310 | typedef struct SCCBcard { | 309 | typedef struct SCCBcard { |
311 | struct sccb * currentSCCB; | 310 | struct sccb * currentSCCB; |
312 | PSCCBMGR_INFO cardInfo; | 311 | struct sccb_mgr_info * cardInfo; |
313 | 312 | ||
314 | unsigned long ioPort; | 313 | unsigned long ioPort; |
315 | 314 | ||
@@ -1108,7 +1107,7 @@ static void (*FPT_s_PhaseTbl[8]) (unsigned long, unsigned char)= { 0 }; | |||
1108 | * | 1107 | * |
1109 | *---------------------------------------------------------------------*/ | 1108 | *---------------------------------------------------------------------*/ |
1110 | 1109 | ||
1111 | static int FlashPoint_ProbeHostAdapter(PSCCBMGR_INFO pCardInfo) | 1110 | static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info * pCardInfo) |
1112 | { | 1111 | { |
1113 | static unsigned char first_time = 1; | 1112 | static unsigned char first_time = 1; |
1114 | 1113 | ||
@@ -1386,7 +1385,7 @@ static int FlashPoint_ProbeHostAdapter(PSCCBMGR_INFO pCardInfo) | |||
1386 | * | 1385 | * |
1387 | *---------------------------------------------------------------------*/ | 1386 | *---------------------------------------------------------------------*/ |
1388 | 1387 | ||
1389 | static unsigned long FlashPoint_HardwareResetHostAdapter(PSCCBMGR_INFO pCardInfo) | 1388 | static unsigned long FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info * pCardInfo) |
1390 | { | 1389 | { |
1391 | PSCCBcard CurrCard = NULL; | 1390 | PSCCBcard CurrCard = NULL; |
1392 | PNVRamInfo pCurrNvRam; | 1391 | PNVRamInfo pCurrNvRam; |
@@ -7788,14 +7787,14 @@ static unsigned char FPT_CalcLrc(unsigned char buffer[]) | |||
7788 | static inline unsigned char | 7787 | static inline unsigned char |
7789 | FlashPoint__ProbeHostAdapter(struct FlashPoint_Info *FlashPointInfo) | 7788 | FlashPoint__ProbeHostAdapter(struct FlashPoint_Info *FlashPointInfo) |
7790 | { | 7789 | { |
7791 | return FlashPoint_ProbeHostAdapter((PSCCBMGR_INFO) FlashPointInfo); | 7790 | return FlashPoint_ProbeHostAdapter((struct sccb_mgr_info *) FlashPointInfo); |
7792 | } | 7791 | } |
7793 | 7792 | ||
7794 | 7793 | ||
7795 | static inline FlashPoint_CardHandle_T | 7794 | static inline FlashPoint_CardHandle_T |
7796 | FlashPoint__HardwareResetHostAdapter(struct FlashPoint_Info *FlashPointInfo) | 7795 | FlashPoint__HardwareResetHostAdapter(struct FlashPoint_Info *FlashPointInfo) |
7797 | { | 7796 | { |
7798 | return FlashPoint_HardwareResetHostAdapter((PSCCBMGR_INFO) FlashPointInfo); | 7797 | return FlashPoint_HardwareResetHostAdapter((struct sccb_mgr_info *) FlashPointInfo); |
7799 | } | 7798 | } |
7800 | 7799 | ||
7801 | static inline void | 7800 | static inline void |