Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / scsi / nsp32.h

diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
index 47c00a6..5addf9f 100644 (file)
--- a/drivers/scsi/nsp32.h
+++ b/drivers/scsi/nsp32.h
@@ -16,6 +16,7 @@
 #ifndef _NSP32_H
 #define _NSP32_H
 
+#include <linux/version.h>
 //#define NSP32_DEBUG 9
 
 /*
@@ -70,11 +71,7 @@ typedef u16 u16_le;
 /*
  * MACRO
  */
-#define NUMBER(arr) ((int) (sizeof(arr) / sizeof(arr[0])))
 #define BIT(x)      (1UL << (x))
-#ifndef MIN
-# define MIN(a,b)   ((a) > (b) ? (b) : (a))
-#endif
 
 /*
  * BASIC Definitions
@@ -503,7 +500,7 @@ typedef struct _nsp32_autoparam {
 #define MSGIN03                        BIT(1)          /* Auto Msg In 03 Flag  */
 
 typedef struct _nsp32_lunt {
-       Scsi_Cmnd       *SCpnt;     /* Current Handling Scsi_Cmnd */
+       struct scsi_cmnd        *SCpnt;     /* Current Handling struct scsi_cmnd */
        unsigned long    save_datp;  /* Save Data Pointer - saved position from initial address */
        int              msgin03;       /* auto msg in 03 flag     */
        unsigned int     sg_num;        /* Total number of SG entries */
@@ -567,11 +564,11 @@ typedef struct _nsp32_hw_data {
        int           IrqNumber;
        int           BaseAddress;
        int           NumAddress;
-       unsigned long MmioAddress;
+       void __iomem *MmioAddress;
 #define NSP32_MMIO_OFFSET 0x0800
        unsigned long MmioLength;
 
-       Scsi_Cmnd *CurrentSC;
+       struct scsi_cmnd *CurrentSC;
 
        struct pci_dev             *Pci;
        const struct pci_device_id *pci_devid;
@@ -609,9 +606,6 @@ typedef struct _nsp32_hw_data {
        unsigned char msginbuf [MSGINBUF_MAX];  /* megin buffer     */
        char          msgin_len;                /* msginbuf length  */
 
-#ifdef CONFIG_PM
-       u32           PciState[16];     /* save PCI state to this area */
-#endif
 } nsp32_hw_data;
 
 /*