gpio: pch: Use .driver_data instead of checking Device IDs again

Previously, pch_gpio_probe() tested the Device ID to determine the type of
IOH.  But the driver core has already matched the Device ID with one of the
IDs in the pch_gpio_pcidev_id[] table, and we can supply the IOH type there
as .driver_data.

Use the pci_device_id.driver_data to learn the IOH type instead of testing
the Device ID again.

No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index a552df298a974c6dbbc84cab2890ed4b6f8967f3..625920421990bbc8d391f9bf2d1ad1a742d0bed8 100644 (file)
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -368,14 +368,7 @@ static int pch_gpio_probe(struct pci_dev *pdev,
        }
 
        chip->base = pcim_iomap_table(pdev)[1];
-
-       if (pdev->device == 0x8803)
-               chip->ioh = INTEL_EG20T_PCH;
-       else if (pdev->device == 0x8014)
-               chip->ioh = OKISEMI_ML7223m_IOH;
-       else if (pdev->device == 0x8043)
-               chip->ioh = OKISEMI_ML7223n_IOH;
-
+       chip->ioh = id->driver_data;
        chip->reg = chip->base;
        pci_set_drvdata(pdev, chip);
        spin_lock_init(&chip->spinlock);
@@ -439,10 +432,14 @@ static int __maybe_unused pch_gpio_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(pch_gpio_pm_ops, pch_gpio_suspend, pch_gpio_resume);
 
 static const struct pci_device_id pch_gpio_pcidev_id[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) },
-       { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) },
-       { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8043) },
-       { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8803) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803),
+         .driver_data = INTEL_EG20T_PCH },
+       { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014),
+         .driver_data = OKISEMI_ML7223m_IOH },
+       { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8043),
+         .driver_data = OKISEMI_ML7223n_IOH },
+       { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8803),
+         .driver_data = INTEL_EG20T_PCH },
        { 0, }
 };
 MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id);