]> err.no Git - linux-2.6/commitdiff
[SCSI] drivers/scsi/FlashPoint.c: remove ushort_ptr
authorAlexey Dobriyan <adobriyan@gmail.com>
Wed, 8 Mar 2006 08:14:27 +0000 (00:14 -0800)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sun, 12 Mar 2006 15:15:00 +0000 (09:15 -0600)
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>
drivers/scsi/FlashPoint.c

index d877a6a12aca48b9ca60567d06210c031ae6f41f..6089af0031300828734eab257f14062525aefb52 100644 (file)
@@ -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];