fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / ide / pci / rz1000.c

diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index 963b845..c185531 100644 (file)
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -17,7 +17,6 @@
 
 #undef REALLY_SLOW_IO          /* most systems can safely undef this */
 
-#include <linux/config.h> /* for CONFIG_BLK_DEV_IDEPCI */
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -33,9 +32,7 @@
 
 #include <asm/io.h>
 
-#include "rz1000.h"
-
-static void __init init_hwif_rz1000 (ide_hwif_t *hwif)
+static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
 {
        u16 reg;
        struct pci_dev *dev = hwif->pci_dev;
@@ -54,29 +51,33 @@ static void __init init_hwif_rz1000 (ide_hwif_t *hwif)
        }
 }
 
+static ide_pci_device_t rz1000_chipset __devinitdata = {
+       .name           = "RZ100x",
+       .init_hwif      = init_hwif_rz1000,
+       .channels       = 2,
+       .autodma        = NODMA,
+       .bootable       = ON_BOARD,
+};
+
 static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &rz1000_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
-       return 0;
+       return ide_setup_pci_device(dev, &rz1000_chipset);
 }
 
 static struct pci_device_id rz1000_pci_tbl[] = {
        { PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-       { PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
+       { PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
 };
 MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl);
 
 static struct pci_driver driver = {
-       .name           = "RZ1000 IDE",
+       .name           = "RZ1000_IDE",
        .id_table       = rz1000_pci_tbl,
        .probe          = rz1000_init_one,
 };
 
-static int rz1000_ide_init(void)
+static int __init rz1000_ide_init(void)
 {
        return ide_pci_register_driver(&driver);
 }