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

Commit 6691678d authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by John W. Linville
Browse files

iwlwifi: use pci_dev->revision, again 



Commit ff938e43 (net: use pci_dev->revision,
again) already converted this driver to using the 'revision' field of 'struct
pci_dev' but commit 084dd791 (iwlagn: move PCI
related operations from probe and remove to PCI layer) has again added the code
to read the PCI revision ID register...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a5e5aa6c

drivers/net/wireless/iwlwifi/iwl-pci.c

+1 −3
Original line number Diff line number Diff line
@@ -383,7 +383,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
{

	struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);

	struct iwl_pci_bus *bus;

	u8 rev_id;

	u16 pci_cmd;

	int err;
@@ -440,8 +439,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		(unsigned long long) pci_resource_len(pdev, 0));

	pr_info("pci_resource_base = %p\n", bus->hw_base);



	pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);

	pr_info("HW Revision ID = 0x%X\n", rev_id);

	pr_info("HW Revision ID = 0x%X\n", pdev->revision);



	/* We disable the RETRY_TIMEOUT register (0x41) to keep

	 * PCI Tx retries from interfering with C3 CPU state */