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

Commit 6a4ecc29 authored by Jon Mason's avatar Jon Mason Committed by John W. Linville
Browse files

rtlwifi: remove unnecessary read of PCI_CAP_ID_EXP 



The PCIE capability offset is saved during PCI bus walking.  It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it.

Also, remove unnecessary and unused #defines for PCI.

Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f05b6911

drivers/net/wireless/rtlwifi/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static void rtl_pci_parse_configuration(struct pci_dev *pdev, 
	u8 linkctrl_reg;



	/*Link Control Register */

	pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);

	pos = pci_pcie_cap(pdev);

	pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &linkctrl_reg);

	pcipriv->ndis_adapter.linkctrl_reg = linkctrl_reg;

drivers/net/wireless/rtlwifi/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -75,11 +75,6 @@ 
#define PCI_CONF_ADDRESS	0x0CF8	/*PCI Configuration Space Address */

#define PCI_CONF_DATA		0x0CFC	/*PCI Configuration Space Data */



#define PCI_CLASS_BRIDGE_DEV		0x06

#define PCI_SUBCLASS_BR_PCI_TO_PCI	0x04

#define PCI_CAPABILITY_ID_PCI_EXPRESS	0x10

#define PCI_CAP_ID_EXP			0x10



#define U1DONTCARE			0xFF

#define U2DONTCARE			0xFFFF

#define U4DONTCARE			0xFFFFFFFF