diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-03-08 03:14:27 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-12 10:15:00 -0500 |
commit | fd1e29ed62cc307281d1a62f73ebac059ac6b6a1 (patch) | |
tree | ce4d046e58d6e4fa0486228fb6481f77a29bb651 /drivers/scsi/FlashPoint.c | |
parent | d63a4cccf387a8e6210cfd818c1ea717beefc531 (diff) |
[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>
Diffstat (limited to 'drivers/scsi/FlashPoint.c')
-rw-r--r-- | drivers/scsi/FlashPoint.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c index d877a6a12aca..6089af003130 100644 --- a/drivers/scsi/FlashPoint.c +++ b/drivers/scsi/FlashPoint.c | |||
@@ -42,7 +42,6 @@ | |||
42 | 42 | ||
43 | 43 | ||
44 | 44 | ||
45 | typedef unsigned short * ushort_ptr; | ||
46 | 45 | ||
47 | 46 | ||
48 | #define s08bits char | 47 | #define s08bits char |
@@ -6003,7 +6002,7 @@ static void FPT_scasid(unsigned char p_card, unsigned long p_port) | |||
6003 | unsigned char i,k,scam_id; | 6002 | unsigned char i,k,scam_id; |
6004 | unsigned char crcBytes[3]; | 6003 | unsigned char crcBytes[3]; |
6005 | PNVRamInfo pCurrNvRam; | 6004 | PNVRamInfo pCurrNvRam; |
6006 | ushort_ptr pCrcBytes; | 6005 | unsigned short * pCrcBytes; |
6007 | 6006 | ||
6008 | pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo; | 6007 | pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo; |
6009 | 6008 | ||
@@ -6023,7 +6022,7 @@ static void FPT_scasid(unsigned char p_card, unsigned long p_port) | |||
6023 | if (!(FPT_sciso(p_port,&temp_id_string[0]))) | 6022 | if (!(FPT_sciso(p_port,&temp_id_string[0]))) |
6024 | { | 6023 | { |
6025 | if(pCurrNvRam){ | 6024 | if(pCurrNvRam){ |
6026 | pCrcBytes = (ushort_ptr)&crcBytes[0]; | 6025 | pCrcBytes = (unsigned short *)&crcBytes[0]; |
6027 | *pCrcBytes = FPT_CalcCrc16(&temp_id_string[0]); | 6026 | *pCrcBytes = FPT_CalcCrc16(&temp_id_string[0]); |
6028 | crcBytes[2] = FPT_CalcLrc(&temp_id_string[0]); | 6027 | crcBytes[2] = FPT_CalcLrc(&temp_id_string[0]); |
6029 | temp_id_string[1] = crcBytes[2]; | 6028 | temp_id_string[1] = crcBytes[2]; |