Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.git] / drivers / ide / pci / trm290.c

diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index f227a05420ee5d184a3dfdc63165795fa3f9d243..0895e753a35d34af4ba8b508fe3422fa82b4c461 100644 (file)
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -240,9 +240,6 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive)
        return (status == 0x00ff);
 }
 
-/*
- * Invoked from ide-dma.c at boot time.
- */
 static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 {
        unsigned int cfgbase = 0;
@@ -250,8 +247,6 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
        u8 reg = 0;
        struct pci_dev *dev = hwif->pci_dev;
 
-       hwif->no_lba48 = 1;
-       hwif->chipset = ide_trm290;
        cfgbase = pci_resource_start(dev, 4);
        if ((dev->class & 5) && cfgbase) {
                hwif->config_data = cfgbase;
@@ -292,9 +287,6 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
        hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq;
 
        hwif->selectproc = &trm290_selectproc;
-       hwif->autodma = 0;              /* play it safe for now */
-       hwif->drives[0].autodma = hwif->autodma;
-       hwif->drives[1].autodma = hwif->autodma;
 #if 1
        {
        /*
@@ -324,12 +316,17 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 #endif
 }
 
-static ide_pci_device_t trm290_chipset __devinitdata = {
+static const struct ide_port_info trm290_chipset __devinitdata = {
        .name           = "TRM290",
        .init_hwif      = init_hwif_trm290,
-       .autodma        = NOAUTODMA,
-       .bootable       = ON_BOARD,
-       .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
+       .chipset        = ide_trm290,
+       .host_flags     = IDE_HFLAG_NO_ATAPI_DMA |
+#if 0 /* play it safe for now */
+                         IDE_HFLAG_TRUST_BIOS_FOR_DMA |
+#endif
+                         IDE_HFLAG_NO_AUTODMA |
+                         IDE_HFLAG_BOOTABLE |
+                         IDE_HFLAG_NO_LBA48,
 };
 
 static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id)
@@ -337,8 +334,8 @@ static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_devic
        return ide_setup_pci_device(dev, &trm290_chipset);
 }
 
-static struct pci_device_id trm290_pci_tbl[] = {
-       { PCI_VENDOR_ID_TEKRAM, PCI_DEVICE_ID_TEKRAM_DC290, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+static const struct pci_device_id trm290_pci_tbl[] = {
+       { PCI_VDEVICE(TEKRAM, PCI_DEVICE_ID_TEKRAM_DC290), 0 },
        { 0, },
 };
 MODULE_DEVICE_TABLE(pci, trm290_pci_tbl);