forked from luck/tmp_suning_uos_patched
[SCSI] drivers/scsi/FlashPoint.c: remove ushort_ptr
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
d63a4cccf3
commit
fd1e29ed62
@ -42,7 +42,6 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short * ushort_ptr;
|
|
||||||
|
|
||||||
|
|
||||||
#define s08bits char
|
#define s08bits char
|
||||||
@ -6003,7 +6002,7 @@ static void FPT_scasid(unsigned char p_card, unsigned long p_port)
|
|||||||
unsigned char i,k,scam_id;
|
unsigned char i,k,scam_id;
|
||||||
unsigned char crcBytes[3];
|
unsigned char crcBytes[3];
|
||||||
PNVRamInfo pCurrNvRam;
|
PNVRamInfo pCurrNvRam;
|
||||||
ushort_ptr pCrcBytes;
|
unsigned short * pCrcBytes;
|
||||||
|
|
||||||
pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo;
|
pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo;
|
||||||
|
|
||||||
@ -6023,7 +6022,7 @@ static void FPT_scasid(unsigned char p_card, unsigned long p_port)
|
|||||||
if (!(FPT_sciso(p_port,&temp_id_string[0])))
|
if (!(FPT_sciso(p_port,&temp_id_string[0])))
|
||||||
{
|
{
|
||||||
if(pCurrNvRam){
|
if(pCurrNvRam){
|
||||||
pCrcBytes = (ushort_ptr)&crcBytes[0];
|
pCrcBytes = (unsigned short *)&crcBytes[0];
|
||||||
*pCrcBytes = FPT_CalcCrc16(&temp_id_string[0]);
|
*pCrcBytes = FPT_CalcCrc16(&temp_id_string[0]);
|
||||||
crcBytes[2] = FPT_CalcLrc(&temp_id_string[0]);
|
crcBytes[2] = FPT_CalcLrc(&temp_id_string[0]);
|
||||||
temp_id_string[1] = crcBytes[2];
|
temp_id_string[1] = crcBytes[2];
|
||||||
|
Loading…
Reference in New Issue
Block a user