diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-03-08 00:14:27 -0800 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-12 09:15:00 -0600 |
| commit | fd1e29ed62cc307281d1a62f73ebac059ac6b6a1 (patch) | |
| tree | ce4d046e58d6e4fa0486228fb6481f77a29bb651 /drivers/scsi/FlashPoint.c | |
| parent | d63a4cccf387a8e6210cfd818c1ea717beefc531 (diff) | |
| download | linux-fd1e29ed62cc307281d1a62f73ebac059ac6b6a1.tar.gz linux-fd1e29ed62cc307281d1a62f73ebac059ac6b6a1.tar.bz2 linux-fd1e29ed62cc307281d1a62f73ebac059ac6b6a1.zip | |
[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 @@ -typedef unsigned short * ushort_ptr; #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 crcBytes[3]; PNVRamInfo pCurrNvRam; - ushort_ptr pCrcBytes; + unsigned short * pCrcBytes; 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(pCurrNvRam){ - pCrcBytes = (ushort_ptr)&crcBytes[0]; + pCrcBytes = (unsigned short *)&crcBytes[0]; *pCrcBytes = FPT_CalcCrc16(&temp_id_string[0]); crcBytes[2] = FPT_CalcLrc(&temp_id_string[0]); temp_id_string[1] = crcBytes[2]; |