From patchwork Mon Jun 27 17:44:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 102234 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 92BD4B6F53 for ; Tue, 28 Jun 2011 03:44:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752555Ab1F0Rot (ORCPT ); Mon, 27 Jun 2011 13:44:49 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:47993 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752598Ab1F0Ros (ORCPT ); Mon, 27 Jun 2011 13:44:48 -0400 Received: by pvg12 with SMTP id 12so2992217pvg.19 for ; Mon, 27 Jun 2011 10:44:48 -0700 (PDT) Received: by 10.68.63.69 with SMTP id e5mr3022361pbs.307.1309196688284; Mon, 27 Jun 2011 10:44:48 -0700 (PDT) Received: from scylla (cpe-70-113-48-102.austin.res.rr.com [70.113.48.102]) by mx.google.com with ESMTPS id x1sm4455823pbb.66.2011.06.27.10.44.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Jun 2011 10:44:47 -0700 (PDT) Received: by scylla (sSMTP sendmail emulation); Mon, 27 Jun 2011 12:44:43 -0500 From: Jon Mason To: Michael Chan Cc: netdev@vger.kernel.org Subject: [PATCH 10/19] bnx2: remove unnecessary read of PCI_CAP_ID_EXP Date: Mon, 27 Jun 2011 12:44:43 -0500 Message-Id: <1309196683-16046-1-git-send-email-jdmason@kudzu.us> X-Mailer: git-send-email 1.7.5.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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, pci_is_pcie is a better way of determining if the device is PCIE or not (as it uses the same saved PCIE capability offset). Signed-off-by: Jon Mason --- drivers/net/bnx2.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 74580bb..7915d14 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -7911,9 +7911,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) bp->chip_id = REG_RD(bp, BNX2_MISC_ID); if (CHIP_NUM(bp) == CHIP_NUM_5709) { - if (pci_find_capability(pdev, PCI_CAP_ID_EXP) == 0) { - dev_err(&pdev->dev, - "Cannot find PCIE capability, aborting\n"); + if (!pci_is_pcie(pdev)) { + dev_err(&pdev->dev, "Not PCIE, aborting\n"); rc = -EIO; goto err_out_unmap; }