lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 3 Sep 2013 15:35:13 +0800 From: Yijing Wang <wangyijing@...wei.com> To: Benjamin Herrenschmidt <benh@...nel.crashing.org>, Gavin Shan <shangw@...ux.vnet.ibm.com>, Bjorn Helgaas <bhelgaas@...gle.com>, "James E.J. Bottomley" <JBottomley@...allels.com>, "David S. Miller" <davem@...emloft.net> CC: <linux-kernel@...r.kernel.org>, <linux-pci@...r.kernel.org>, Yijing Wang <wangyijing@...wei.com>, Hanjun Guo <guohanjun@...wei.com>, <e1000-devel@...ts.sourceforge.net>, <netdev@...r.kernel.org> Subject: [PATCH 5/7] ixgbe: use pcie_capability_read_word() to simplify code use pcie_capability_read_word() to simplify code. Signed-off-by: Yijing Wang <wangyijing@...wei.com> Cc: e1000-devel@...ts.sourceforge.net Cc: netdev@...r.kernel.org Cc: linux-kernel@...r.kernel.org --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index bad8f14..bfa0b06 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -152,7 +152,6 @@ MODULE_VERSION(DRV_VERSION); static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter, u32 reg, u16 *value) { - int pos = 0; struct pci_dev *parent_dev; struct pci_bus *parent_bus; @@ -164,11 +163,10 @@ static int ixgbe_read_pci_cfg_word_parent(struct ixgbe_adapter *adapter, if (!parent_dev) return -1; - pos = pci_find_capability(parent_dev, PCI_CAP_ID_EXP); - if (!pos) + if (!pci_is_pcie(parent_dev)) return -1; - pci_read_config_word(parent_dev, pos + reg, value); + pcie_capability_read_word(parent_dev, reg, value); return 0; } -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists