1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 2c24c3de8846..19778c5fe711 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -80,7 +80,7 @@ static int hpt34x_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 
 static void hpt34x_tune_drive (ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 5, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 5);
         (void) hpt34x_tune_chipset(drive, (XFER_PIO_0 + pio));
 }
 
@@ -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.
@@ -182,10 +175,10 @@ static ide_pci_device_t hpt34x_chipset __devinitdata = {
         .name           = "HPT34X",
         .init_chipset   = init_chipset_hpt34x,
         .init_hwif      = init_hwif_hpt34x,
-        .channels       = 2,
         .autodma        = NOAUTODMA,
         .bootable       = NEVER_BOARD,
-        .extra          = 16
+        .extra          = 16,
+        .pio_mask       = ATA_PIO5,
 };
 
 static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_device_id *id)