[SCSI] ipr: Remove usage of pci driver data

Since ipr handles dynamic ids, it must handle driver_data
not being set, so remove the current usage of driver_data
so it can be used for other things in future patches.

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 20 insertions, 43 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index b318500785e5..0f1d654ea352 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -7166,9 +7166,6 @@ ipr_get_chip_cfg(const struct pci_device_id *dev_id)
 {
         int i;
 
-        if (dev_id->driver_data)
-                return (const struct ipr_chip_cfg_t *)dev_id->driver_data;
-
         for (i = 0; i < ARRAY_SIZE(ipr_chip); i++)
                 if (ipr_chip[i].vendor == dev_id->vendor &&
                     ipr_chip[i].device == dev_id->device)
@@ -7517,65 +7514,45 @@ static void ipr_shutdown(struct pci_dev *pdev)
 
 static struct pci_device_id ipr_pci_table[] __devinitdata = {
         { PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_5702,
-                0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_5702, 0, 0, 0 },
         { PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_5703,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_5703, 0, 0, 0 },
         { PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_573D,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_573D, 0, 0, 0 },
         { PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_573E,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_573E, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571B,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571B, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572E,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572E, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571A,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571A, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575B,
-                0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575B, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B8,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B8, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
-              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7,
-              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2780,
-                0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2780, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571E,
-                0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571E, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571F,
-                0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571F, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
-                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572F,
-                0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572F, 0, 0, 0 },
         { }
 };
 MODULE_DEVICE_TABLE(pci, ipr_pci_table);