[PATCH] cpqfc compaq FC controller 2.5.12

Minor cleanups to a scsi fibre channel HBA driver that was broken by the
introduction of SCSI_REPORT_LUNS to scsi.h in a patch that went into
2.5.11 .

[ Another transfer from Dave's tree ]

drivers/scsi/cpqfcTSinit.c

@@ -41,9 +41,9 @@
 #include <linux/timer.h>
 #include <linux/ioport.h>  // request_region() prototype
 #include <linux/vmalloc.h> // ioremap()
-#if LINUX_VERSION_CODE >= LinuxVersionCode(2,4,7)
+//#if LINUX_VERSION_CODE >= LinuxVersionCode(2,4,7)
 #include <linux/completion.h>
-#endif
+//#endif
 #ifdef __alpha__
 #define __KERNEL_SYSCALLS__
 #endif
@@ -532,7 +532,7 @@ int cpqfcTS_ioctl( Scsi_Device *ScsiDev, int Cmnd, void *arg)
 
 	// must be super user to send stuff directly to the
 	// controller and/or physical drives...
-	if( !suser() )
+	if( !capable(CAP_SYS_ADMIN) )
 	  return -EPERM;
 
 	// copy the caller's struct to our space.

drivers/scsi/cpqfcTSstructs.h

@@ -226,7 +226,6 @@ typedef __u8 BOOLEAN;
 #define ELS_PRLI_ACC 0x22  // {FCP-SCSI} Process Login Accept
 #define ELS_RJT 0x1000000
 #define SCSI_REPORT_LUNS 0x0A0
-#define REPORT_LUNS 0xA0 // SCSI-3 command op-code
 #define FCP_TARGET_RESET 0x200
 
 #define ELS_LILP_FRAME 0x00000711 // 1st payload word of LILP frame