Commit fd1e29ed authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by James Bottomley

[SCSI] drivers/scsi/FlashPoint.c: remove ushort_ptr

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 d63a4ccc
...@@ -42,7 +42,6 @@ ...@@ -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) ...@@ -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) ...@@ -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];
......
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