ACPI: processor: Rearrange and clean up acpi_processor_errata_piix4()

In acpi_processor_errata_piix4() it is not necessary to use three
struct pci_dev pointers.  One is sufficient, so use it everywhere and
drop the other two.

Additionally, define the auxiliary local variables value1 and value2
in the code block in which they are used.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2846888.mvXUDI8C0e@rafael.j.wysocki

diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index b1652cab631aa34980744c373fa956342c6d9855..2afe798d15864907aebd5a47c4df8549799fd8c4 100644 (file)
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -48,11 +48,6 @@ acpi_handle acpi_get_processor_handle(int cpu)
 
 static int acpi_processor_errata_piix4(struct pci_dev *dev)
 {
-       u8 value1 = 0;
-       u8 value2 = 0;
-       struct pci_dev *ide_dev = NULL, *isa_dev = NULL;
-
-
        if (!dev)
                return -EINVAL;
 
@@ -108,16 +103,16 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
                 * each IDE controller's DMA status to make sure we catch all
                 * DMA activity.
                 */
-               ide_dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
+               dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
                                     PCI_DEVICE_ID_INTEL_82371AB,
                                     PCI_ANY_ID, PCI_ANY_ID, NULL);
-               if (ide_dev) {
-                       errata.piix4.bmisx = pci_resource_start(ide_dev, 4);
+               if (dev) {
+                       errata.piix4.bmisx = pci_resource_start(dev, 4);
                        if (errata.piix4.bmisx)
-                               dev_dbg(&ide_dev->dev,
+                               dev_dbg(&dev->dev,
                                        "Bus master activity detection (BM-IDE) erratum enabled\n");
 
-                       pci_dev_put(ide_dev);
+                       pci_dev_put(dev);
                }
 
                /*
@@ -129,18 +124,20 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
                 * disable C3 support if this is enabled, as some legacy
                 * devices won't operate well if fast DMA is disabled.
                 */
-               isa_dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
+               dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
                                     PCI_DEVICE_ID_INTEL_82371AB_0,
                                     PCI_ANY_ID, PCI_ANY_ID, NULL);
-               if (isa_dev) {
-                       pci_read_config_byte(isa_dev, 0x76, &value1);
-                       pci_read_config_byte(isa_dev, 0x77, &value2);
+               if (dev) {
+                       u8 value1 = 0, value2 = 0;
+
+                       pci_read_config_byte(dev, 0x76, &value1);
+                       pci_read_config_byte(dev, 0x77, &value2);
                        if ((value1 & 0x80) || (value2 & 0x80)) {
                                errata.piix4.fdma = 1;
-                               dev_dbg(&isa_dev->dev,
+                               dev_dbg(&dev->dev,
                                        "Type-F DMA livelock erratum (C3 disabled)\n");
                        }
-                       pci_dev_put(isa_dev);
+                       pci_dev_put(dev);
                }
 
                break;