Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69b3e619 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Jesse Barnes
Browse files

PCI hotplug: cpqphp: use pci_dev->subsystem_{vendor|device} 



The driver reads PCI subsystem IDs from the PCI configuration registers while
they are already stored by the PCI subsystem in the 'subsystem_{vendor|device}'
fields of 'struct pci_dev'...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent db34a363

drivers/pci/hotplug/cpqphp_core.c

+2 −10
Original line number Diff line number Diff line
@@ -868,11 +868,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* TODO: This code can be made to support non-Compaq or Intel

	 * subsystem IDs

	 */

	rc = pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vid);

	if (rc) {

		err("%s : pci_read_config_word failed\n", __func__);

		goto err_disable_device;

	}

	subsystem_vid = pdev->subsystem_vendor;

	dbg("Subsystem Vendor ID: %x\n", subsystem_vid);

	if ((subsystem_vid != PCI_VENDOR_ID_COMPAQ) && (subsystem_vid != PCI_VENDOR_ID_INTEL)) {

		err(msg_HPC_non_compaq_or_intel);
@@ -887,11 +883,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_disable_device;

	}



	rc = pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &subsystem_deviceid);

	if (rc) {

		err("%s : pci_read_config_word failed\n", __func__);

		goto err_free_ctrl;

	}

	subsystem_deviceid = pdev->subsystem_device;



	info("Hot Plug Subsystem Device ID: %x\n", subsystem_deviceid);