ide: use PCI_VDEVICE() macro

[mirror_ubuntu-bionic-kernel.git] / drivers / ide / pci / hpt34x.c

diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 218852aaf22aa11329dae8d320f3b6be1ba091c2..88472e5a3ec7a3f43ff02685701ed80483de8496 100644 (file)
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -80,19 +80,6 @@ static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio)
        hpt34x_set_mode(drive, XFER_PIO_0 + pio);
 }
 
-static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
-{
-       drive->init_speed = 0;
-
-       if (ide_tune_dma(drive))
-               return -1;
-
-       if (ide_use_fast_pio(drive))
-               ide_set_max_pio(drive);
-
-       return -1;
-}
-
 /*
  * If the BIOS does not set the IO base addaress to XX00, 343 will fail.
  */
@@ -159,7 +146,6 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif)
        hwif->swdma_mask = 0x07;
 #endif
 
-       hwif->ide_dma_check = &hpt34x_config_drive_xfer_rate;
        if (!noautodma)
                hwif->autodma = (pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0;
        hwif->drives[0].autodma = hwif->autodma;
@@ -190,8 +176,8 @@ static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_devic
        return ide_setup_pci_device(dev, d);
 }
 
-static struct pci_device_id hpt34x_pci_tbl[] = {
-       { PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+static const struct pci_device_id hpt34x_pci_tbl[] = {
+       { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT343), 0 },
        { 0, },
 };
 MODULE_DEVICE_TABLE(pci, hpt34x_pci_tbl);