Merge branch 'machtypes' into pxa-palm

1 files changed, 11 insertions, 17 deletions

diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index b9e457996d0e..af0f30051d5a 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -47,13 +47,18 @@ static const struct ide_port_ops delkin_cb_port_ops = {
         .quirkproc              = ide_undecoded_slave,
 };
 
+static const struct ide_port_info delkin_cb_port_info = {
+        .port_ops               = &delkin_cb_port_ops,
+        .host_flags             = IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS |
+                                  IDE_HFLAG_NO_DMA,
+};
+
 static int __devinit
 delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 {
         unsigned long base;
         hw_regs_t hw;
         ide_hwif_t *hwif = NULL;
-        ide_drive_t *drive;
         int i, rc;
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
@@ -79,6 +84,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         memset(&hw, 0, sizeof(hw));
         ide_std_init_ports(&hw, base + 0x10, base + 0x1e);
         hw.irq = dev->irq;
+        hw.dev = &dev->dev;
         hw.chipset = ide_pci;           /* this enables IRQ sharing */
 
         hwif = ide_find_port();
@@ -89,26 +95,16 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 
         ide_init_port_data(hwif, i);
         ide_init_port_hw(hwif, &hw);
-        hwif->port_ops = &delkin_cb_port_ops;
 
         idx[0] = i;
 
-        ide_device_add(idx, NULL);
-
-        if (!hwif->present)
-                goto out_disable;
+        ide_device_add(idx, &delkin_cb_port_info);
 
         pci_set_drvdata(dev, hwif);
-        hwif->dev = &dev->dev;
-        drive = &hwif->drives[0];
-        if (drive->present) {
-                drive->io_32bit = 1;
-                drive->unmask   = 1;
-        }
+
         return 0;
 
 out_disable:
-        printk(KERN_ERR "delkin_cb: no IDE devices found\n");
         pci_release_regions(dev);
         pci_disable_device(dev);
         return -ENODEV;
@@ -139,14 +135,12 @@ static struct pci_driver driver = {
         .remove         = delkin_cb_remove,
 };
 
-static int
-delkin_cb_init (void)
+static int __init delkin_cb_init(void)
 {
         return pci_register_driver(&driver);
 }
 
-static void
-delkin_cb_exit (void)
+static void __exit delkin_cb_exit(void)
 {
         pci_unregister_driver(&driver);
 }