Skip to content

L
linux
Commit f31dc0cd authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by James Bottomley
Browse files
Options

[SCSI] drivers/scsi/FlashPoint.c: untypedef struct SCCBMgr_tar_info 

* struct SCCBMgr_tar_info => struct sccb_mgr_tar_info
* PSCCBMgr_tar_info => struct sccb_mgr_tar_info *
* SCCBMGR_TAR_INFO => struct sccb_mgr_tar_info
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 7f101662
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 27 deletions
drivers/scsi/FlashPoint.c
View file @ f31dc0cd
...@@ -268,10 +268,9 @@ struct sccb { ...@@ -268,10 +268,9 @@ struct sccb {
#define EE_WIDE_SCSI BIT(7) #define EE_WIDE_SCSI BIT(7)
typedef struct SCCBMgr_tar_info *PSCCBMgr_tar_info;
typedef struct SCCBMgr_tar_info { struct sccb_mgr_tar_info {
struct sccb * TarSelQ_Head; struct sccb * TarSelQ_Head;
struct sccb * TarSelQ_Tail; struct sccb * TarSelQ_Tail;
...@@ -284,7 +283,7 @@ typedef struct SCCBMgr_tar_info { ...@@ -284,7 +283,7 @@ typedef struct SCCBMgr_tar_info {
unsigned char TarReserved[2]; /* for alignment */ unsigned char TarReserved[2]; /* for alignment */
unsigned char LunDiscQ_Idx[MAX_LUN]; unsigned char LunDiscQ_Idx[MAX_LUN];
unsigned char TarLUNBusy[MAX_LUN]; unsigned char TarLUNBusy[MAX_LUN];
} SCCBMGR_TAR_INFO; };
typedef struct NVRAMInfo { typedef struct NVRAMInfo {
unsigned char niModel; /* Model No. of card */ unsigned char niModel; /* Model No. of card */
...@@ -975,7 +974,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card,struct sccb * ...@@ -975,7 +974,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card,struct sccb *
static void FPT_stsyncn(unsigned long port, unsigned char p_card); static void FPT_stsyncn(unsigned long port, unsigned char p_card);
static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned char offset); static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned char offset);
static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value, static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value,
PSCCBMgr_tar_info currTar_Info); struct sccb_mgr_tar_info * currTar_Info);
static void FPT_sresb(unsigned long port, unsigned char p_card); static void FPT_sresb(unsigned long port, unsigned char p_card);
static void FPT_sxfrp(unsigned long p_port, unsigned char p_card); static void FPT_sxfrp(unsigned long p_port, unsigned char p_card);
static void FPT_schkdd(unsigned long port, unsigned char p_card); static void FPT_schkdd(unsigned long port, unsigned char p_card);
...@@ -1081,7 +1080,7 @@ static void FPT_autoLoadDefaultMap(unsigned long p_port); ...@@ -1081,7 +1080,7 @@ static void FPT_autoLoadDefaultMap(unsigned long p_port);
static SCCBMGR_TAR_INFO FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } }; static struct sccb_mgr_tar_info FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } };
static SCCBCARD FPT_BL_Card[MAX_CARDS] = { { 0 } }; static SCCBCARD FPT_BL_Card[MAX_CARDS] = { { 0 } };
static SCCBSCAM_INFO FPT_scamInfo[MAX_SCSI_TAR] = { { { 0 } } }; static SCCBSCAM_INFO FPT_scamInfo[MAX_SCSI_TAR] = { { { 0 } } };
static NVRAMINFO FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } }; static NVRAMINFO FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } };
...@@ -1793,7 +1792,7 @@ static int FlashPoint_AbortCCB(unsigned long pCurrCard, struct sccb * p_Sccb) ...@@ -1793,7 +1792,7 @@ static int FlashPoint_AbortCCB(unsigned long pCurrCard, struct sccb * p_Sccb)
CALL_BK_FN callback; CALL_BK_FN callback;
unsigned char TID; unsigned char TID;
struct sccb * pSaveSCCB; struct sccb * pSaveSCCB;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
ioport = ((PSCCBcard) pCurrCard)->ioPort; ioport = ((PSCCBcard) pCurrCard)->ioPort;
...@@ -2161,7 +2160,7 @@ static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port, unsigned char p_c ...@@ -2161,7 +2160,7 @@ static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port, unsigned char p_c
PSCCBcard pCurrCard, unsigned short p_int) PSCCBcard pCurrCard, unsigned short p_int)
{ {
unsigned char temp, ScamFlg; unsigned char temp, ScamFlg;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
PNVRamInfo pCurrNvRam; PNVRamInfo pCurrNvRam;
...@@ -2373,7 +2372,7 @@ static void FPT_SccbMgrTableInitTarget(unsigned char p_card, unsigned char targe ...@@ -2373,7 +2372,7 @@ static void FPT_SccbMgrTableInitTarget(unsigned char p_card, unsigned char targe
{ {
unsigned char lun, qtag; unsigned char lun, qtag;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currTar_Info = &FPT_sccbMgrTbl[p_card][target]; currTar_Info = &FPT_sccbMgrTbl[p_card][target];
...@@ -2496,7 +2495,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card) ...@@ -2496,7 +2495,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card)
unsigned long cdb_reg; unsigned long cdb_reg;
PSCCBcard CurrCard; PSCCBcard CurrCard;
struct sccb * currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
unsigned char lastTag, lun; unsigned char lastTag, lun;
CurrCard = &FPT_BL_Card[p_card]; CurrCard = &FPT_BL_Card[p_card];
...@@ -2805,7 +2804,7 @@ static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCa ...@@ -2805,7 +2804,7 @@ static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCa
unsigned char our_target, message, lun = 0, tag, msgRetryCount; unsigned char our_target, message, lun = 0, tag, msgRetryCount;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
struct sccb * currSCCB; struct sccb * currSCCB;
...@@ -3113,7 +3112,7 @@ static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p ...@@ -3113,7 +3112,7 @@ static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p
{ {
struct sccb * currSCCB; struct sccb * currSCCB;
PSCCBcard CurrCard; PSCCBcard CurrCard;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
CurrCard = &FPT_BL_Card[p_card]; CurrCard = &FPT_BL_Card[p_card];
currSCCB = CurrCard->currentSCCB; currSCCB = CurrCard->currentSCCB;
...@@ -3370,7 +3369,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card, struct sccb * ...@@ -3370,7 +3369,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card, struct sccb *
static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag) static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag)
{ {
struct sccb * currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID]; currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
...@@ -3446,7 +3445,7 @@ static void FPT_stsyncn(unsigned long port, unsigned char p_card) ...@@ -3446,7 +3445,7 @@ static void FPT_stsyncn(unsigned long port, unsigned char p_card)
{ {
unsigned char sync_msg,offset,sync_reg,our_sync_msg; unsigned char sync_msg,offset,sync_reg,our_sync_msg;
struct sccb * currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID]; currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
...@@ -3608,7 +3607,7 @@ static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned ch ...@@ -3608,7 +3607,7 @@ static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned ch
static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card) static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card)
{ {
struct sccb * currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID]; currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
...@@ -3661,7 +3660,7 @@ static void FPT_stwidn(unsigned long port, unsigned char p_card) ...@@ -3661,7 +3660,7 @@ static void FPT_stwidn(unsigned long port, unsigned char p_card)
{ {
unsigned char width; unsigned char width;
struct sccb * currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID]; currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
...@@ -3767,7 +3766,7 @@ static void FPT_siwidr(unsigned long port, unsigned char width) ...@@ -3767,7 +3766,7 @@ static void FPT_siwidr(unsigned long port, unsigned char width)
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value, static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value,
PSCCBMgr_tar_info currTar_Info) struct sccb_mgr_tar_info * currTar_Info)
{ {
unsigned char index; unsigned char index;
...@@ -3842,7 +3841,7 @@ static void FPT_sresb(unsigned long port, unsigned char p_card) ...@@ -3842,7 +3841,7 @@ static void FPT_sresb(unsigned long port, unsigned char p_card)
{ {
unsigned char scsiID, i; unsigned char scsiID, i;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
WR_HARPOON(port+hp_page_ctrl, WR_HARPOON(port+hp_page_ctrl,
(RD_HARPOON(port+hp_page_ctrl) | G_INT_DISABLE)); (RD_HARPOON(port+hp_page_ctrl) | G_INT_DISABLE));
...@@ -4157,7 +4156,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card) ...@@ -4157,7 +4156,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card)
static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card) static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card)
{ {
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
if((p_sccb->TargID > MAX_SCSI_TAR) || (p_sccb->Lun > MAX_LUN)) if((p_sccb->TargID > MAX_SCSI_TAR) || (p_sccb->Lun > MAX_LUN))
{ {
...@@ -4429,7 +4428,7 @@ static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card) ...@@ -4429,7 +4428,7 @@ static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card)
{ {
unsigned char message,scsiID; unsigned char message,scsiID;
struct sccb * currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -6936,7 +6935,7 @@ static void FPT_DiagEEPROM(unsigned long p_port) ...@@ -6936,7 +6935,7 @@ static void FPT_DiagEEPROM(unsigned long p_port)
static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card) static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
{ {
unsigned char scan_ptr, lun; unsigned char scan_ptr, lun;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
struct sccb * pOldSccb; struct sccb * pOldSccb;
scan_ptr = pCurrCard->scanIndex; scan_ptr = pCurrCard->scanIndex;
...@@ -7067,7 +7066,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card) ...@@ -7067,7 +7066,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card) static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card)
{ {
unsigned char thisTarg; unsigned char thisTarg;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
if (pCurrCard->currentSCCB != NULL) if (pCurrCard->currentSCCB != NULL)
{ {
...@@ -7109,7 +7108,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb, ...@@ -7109,7 +7108,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb,
unsigned char i, SCSIcmd; unsigned char i, SCSIcmd;
CALL_BK_FN callback; CALL_BK_FN callback;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
SCSIcmd = p_sccb->Cdb[0]; SCSIcmd = p_sccb->Cdb[0];
...@@ -7207,7 +7206,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb, ...@@ -7207,7 +7206,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb,
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_queueDisconnect(struct sccb * p_sccb, unsigned char p_card) static void FPT_queueDisconnect(struct sccb * p_sccb, unsigned char p_card)
{ {
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currTar_Info = &FPT_sccbMgrTbl[p_card][p_sccb->TargID]; currTar_Info = &FPT_sccbMgrTbl[p_card][p_sccb->TargID];
...@@ -7244,7 +7243,7 @@ static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code) ...@@ -7244,7 +7243,7 @@ static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code)
{ {
unsigned char qtag,thisTarg; unsigned char qtag,thisTarg;
struct sccb * currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
if(currSCCB != NULL) if(currSCCB != NULL)
...@@ -7283,7 +7282,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg ...@@ -7283,7 +7282,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg
unsigned char error_code) unsigned char error_code)
{ {
unsigned char qtag; unsigned char qtag;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg]; currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg];
...@@ -7311,7 +7310,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg ...@@ -7311,7 +7310,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg
static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card) static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card)
{ {
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID]; currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];
p_SCCB->Sccb_forwardlink = NULL; p_SCCB->Sccb_forwardlink = NULL;
...@@ -7346,7 +7345,7 @@ static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card) ...@@ -7346,7 +7345,7 @@ static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card)
static unsigned char FPT_queueFindSccb(struct sccb * p_SCCB, unsigned char p_card) static unsigned char FPT_queueFindSccb(struct sccb * p_SCCB, unsigned char p_card)
{ {
struct sccb * q_ptr; struct sccb * q_ptr;
PSCCBMgr_tar_info currTar_Info; struct sccb_mgr_tar_info * currTar_Info;
currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID]; currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7