Commit 68d0c1ae authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by James Bottomley
Browse files

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



* struct NVRAMInfo => struct nvram_info
* PNVRamInfo => struct nvram_info *
* NVRAMINFO => struct nvram_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 f31dc0cd

drivers/scsi/FlashPoint.c

+13 −14
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ struct sccb_mgr_tar_info { 
   unsigned char    TarLUNBusy[MAX_LUN];

};



typedef struct NVRAMInfo {

struct nvram_info {

	unsigned char		niModel;								/* Model No. of card */

	unsigned char		niCardNo;							/* Card no. */

	unsigned long		niBaseAddr;							/* Port Address of card */
@@ -295,9 +295,8 @@ typedef struct NVRAMInfo { 
	unsigned char		niAdapId;							/* Host Adapter ID - Byte 24 of eerpom map */

	unsigned char		niSyncTbl[MAX_SCSI_TAR / 2];	/* Sync/Wide byte of targets */

	unsigned char		niScamTbl[MAX_SCSI_TAR][4];	/* Compressed Scam name string of Targets */

}NVRAMINFO;

};



typedef NVRAMINFO *PNVRamInfo;



#define	MODEL_LT		1

#define	MODEL_DL		2
@@ -318,7 +317,7 @@ typedef struct SCCBcard { 
   unsigned char scanIndex;

   unsigned char globalFlags;

   unsigned char ourId;

   PNVRamInfo pNvRamInfo;

   struct nvram_info * pNvRamInfo;

   struct sccb * discQ_Tbl[QUEUE_DEPTH];

      

}SCCBCARD;
@@ -987,7 +986,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg 
				    unsigned char error_code);



static void  FPT_sinits(struct sccb * p_sccb, unsigned char p_card);

static void  FPT_RNVRamData(PNVRamInfo pNvRamInfo);

static void  FPT_RNVRamData(struct nvram_info * pNvRamInfo);



static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card);

static void  FPT_stwidn(unsigned long port, unsigned char p_card);
@@ -1083,7 +1082,7 @@ static void FPT_autoLoadDefaultMap(unsigned long p_port); 
static struct sccb_mgr_tar_info FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } };

static SCCBCARD FPT_BL_Card[MAX_CARDS] = { { 0 } };

static SCCBSCAM_INFO FPT_scamInfo[MAX_SCSI_TAR] = { { { 0 } } };

static NVRAMINFO FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } };

static struct nvram_info FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } };





static unsigned char FPT_mbCards = 0;
@@ -1113,7 +1112,7 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info * pCardInfo) 
   unsigned char i,j,id,ScamFlg;

   unsigned short temp,temp2,temp3,temp4,temp5,temp6;

   unsigned long ioport;

	PNVRamInfo pCurrNvRam;

	struct nvram_info * pCurrNvRam;



   ioport = pCardInfo->si_baseaddr;
@@ -1387,7 +1386,7 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info * pCardInfo) 
static unsigned long FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info * pCardInfo)

{

   PSCCBcard CurrCard = NULL;

	PNVRamInfo pCurrNvRam;

	struct nvram_info * pCurrNvRam;

   unsigned char i,j,thisCard, ScamFlg;

   unsigned short temp,sync_bit_map,id;

   unsigned long ioport;
@@ -1572,7 +1571,7 @@ static void FlashPoint_ReleaseHostAdapter(unsigned long pCurrCard) 
	unsigned long regOffset;

	unsigned long scamData;

	unsigned long *pScamTbl;

	PNVRamInfo pCurrNvRam;

	struct nvram_info * pCurrNvRam;



	pCurrNvRam = ((PSCCBcard)pCurrCard)->pNvRamInfo;
@@ -1601,7 +1600,7 @@ static void FlashPoint_ReleaseHostAdapter(unsigned long pCurrCard) 
}





static void FPT_RNVRamData(PNVRamInfo pNvRamInfo)

static void FPT_RNVRamData(struct nvram_info * pNvRamInfo)

{

	unsigned char i;

	unsigned long portBase;
@@ -2161,7 +2160,7 @@ static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port, unsigned char p_c 
{

   unsigned char temp, ScamFlg;

   struct sccb_mgr_tar_info * currTar_Info;

   PNVRamInfo pCurrNvRam;

   struct nvram_info * pCurrNvRam;





   if (RD_HARPOON(p_port+hp_ext_status) &
@@ -5701,7 +5700,7 @@ static void FPT_scini(unsigned char p_card, unsigned char p_our_id, unsigned cha 


   unsigned char i,k,ScamFlg ;

   PSCCBcard currCard;

	PNVRamInfo pCurrNvRam;

	struct nvram_info * pCurrNvRam;



   currCard = &FPT_BL_Card[p_card];

   p_port = currCard->ioPort;
@@ -5992,7 +5991,7 @@ static void FPT_scasid(unsigned char p_card, unsigned long p_port) 


   unsigned char i,k,scam_id;

	unsigned char crcBytes[3];

	PNVRamInfo pCurrNvRam;

	struct nvram_info * pCurrNvRam;

	unsigned short * pCrcBytes;



	pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo;
@@ -6453,7 +6452,7 @@ static void FPT_inisci(unsigned char p_card, unsigned long p_port, unsigned char 
{

   unsigned char i,k,max_id;

   unsigned short ee_data;

	PNVRamInfo pCurrNvRam;

	struct nvram_info * pCurrNvRam;



	pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo;