5 files changed, 2 insertions, 38 deletions

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index e5d09367627e..6d18fef558bd 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -174,12 +174,6 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const ch
 {
         int bus_speed = system_bus_clock();
 
-        if (dev->resource[PCI_ROM_RESOURCE].start) {
-                pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-                printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
-                        (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
-        }
-
         if (bus_speed <= 33)
                 pci_set_drvdata(dev, (void *) aec6xxx_33_base);
         else
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 2c24c3de8846..64f19743b127 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -120,17 +120,10 @@ static unsigned int __devinit init_chipset_hpt34x(struct pci_dev *dev, const cha
         pci_write_config_byte(dev, HPT34X_PCI_INIT_REG, 0x00);
         pci_read_config_word(dev, PCI_COMMAND, &cmd);
 
-        if (cmd & PCI_COMMAND_MEMORY) {
-                if (pci_resource_start(dev, PCI_ROM_RESOURCE)) {
-                        pci_write_config_dword(dev, PCI_ROM_ADDRESS,
-                                dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-                        printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n",
-                                (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
-                }
+        if (cmd & PCI_COMMAND_MEMORY)
                 pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0);
-        } else {
+        else
                 pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x20);
-        }
 
         /*
          * Since 20-23 can be assigned and are R/W, we correct them.
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index e9b07a97c340..81853d740aee 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -994,14 +994,6 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
          */
         *info = *(struct hpt_info *)pci_get_drvdata(dev);
 
-        /*
-         * FIXME: Not portable. Also, why do we enable the ROM in the first place?
-         * We don't seem to be using it.
-         */
-        if (dev->resource[PCI_ROM_RESOURCE].start)
-                pci_write_config_dword(dev, PCI_ROM_ADDRESS,
-                        dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-
         pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4));
         pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78);
         pci_write_config_byte(dev, PCI_MIN_GNT, 0x08);
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index ee5020df005d..06c5e93d37a2 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -378,13 +378,6 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha
         int f, r;
         u8 pll_ctl0, pll_ctl1;
 
-        if (dev->resource[PCI_ROM_RESOURCE].start) {
-                pci_write_config_dword(dev, PCI_ROM_ADDRESS,
-                        dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-                printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
-                        (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
-        }
-
 #ifdef CONFIG_PPC_PMAC
         apple_kiwi_init(dev);
 #endif
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 41ac4a94959f..25cebfe18ddd 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -316,14 +316,6 @@ static void pdc202xx_reset (ide_drive_t *drive)
 static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev,
                                                         const char *name)
 {
-        /* This doesn't appear needed */
-        if (dev->resource[PCI_ROM_RESOURCE].start) {
-                pci_write_config_dword(dev, PCI_ROM_ADDRESS,
-                        dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-                printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
-                        (unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
-        }
-
         return dev->irq;
 }