From patchwork Tue Jul 21 00:14:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6831491 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 82C7AC05AC for ; Tue, 21 Jul 2015 00:14:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91C8D206A0 for ; Tue, 21 Jul 2015 00:14:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB98520632 for ; Tue, 21 Jul 2015 00:14:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757190AbbGUAOv (ORCPT ); Mon, 20 Jul 2015 20:14:51 -0400 Received: from mail-ie0-f175.google.com ([209.85.223.175]:36626 "EHLO mail-ie0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756847AbbGUAOu (ORCPT ); Mon, 20 Jul 2015 20:14:50 -0400 Received: by iehx8 with SMTP id x8so49646199ieh.3 for ; Mon, 20 Jul 2015 17:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=lpxFBLm6EPWtE2D9zKo2F0zAUJXGUAkVbUNj5DMRXxk=; b=FbsEtTa9r1kryFhESsuii+iF3tU+UVCCNdm7/xtW1CCHqv8yc47wYi6xieKOpQKKtF 1y3swW+CbTAHxGMqGBUMSGuFUXwRhJT5R+cFMDB9ioYspfDTCpL0yljy/YLxbOWtA4zw mLR8YUpQD6c8bBIhciXT+gLaEenp/rGlFwcO/S/SEd1sD3FY0rQSLFINNVIkjSryhpIX Sa0dhJT5MTu4LvzWZX0t6t64RozrK/xpMG2y+MksVq89ul4OP+lvSB0PTJw8fh9WjIvZ 6kDltfMGLEOVs8xYJ4zFVXIqNQPB4ALsF+hlNFurRLM/w/ms7RIh5llrgTY1QK0alNme REqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=lpxFBLm6EPWtE2D9zKo2F0zAUJXGUAkVbUNj5DMRXxk=; b=TXOSUqELtZddQgzMy52XMVCn9BdsNrmLEZmZ84pnq2go7oZywZ7hFvJpEYw4n1Htw5 He3uh3tgHp2fva3kRoIzxazJq8EvviFKXfAbqDtI7ads0/nVY9zsPspMR8Zaky36W4XZ 6xDLXnqj9Aywz+HbvrKdPsNJ6olNVMDc/o11LtXsPu4WjT03mcieRIfjOkr/W/iS9P5T e1UG5n8KpUzEFqx2J6BMji+Cd36FiVPE/zeSKOTM6fUta+DhX2GmTlKumCY/TxBm3jj4 HdZIkiiqSdQuq3Y/RrMqesNnQPd7RmiIV4xO9Q95fHq/GvA38We5z46bk2SSC/xQBZ+9 DZUg== X-Gm-Message-State: ALoCoQmEoBtUOuf3yMjmmDAb+N593EW0CCykmcFdrFZf8jsrsYFuOAgCFN9FBC0FnrvCOVYYM6Ws X-Received: by 10.50.8.68 with SMTP id p4mr19626318iga.4.1437437689496; Mon, 20 Jul 2015 17:14:49 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id ig10sm6264788igb.21.2015.07.20.17.14.47 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 20 Jul 2015 17:14:48 -0700 (PDT) Subject: [PATCH v2 07/11] PCI: Use pci_physfn() rather than looking up physfn by hand To: linux-pci@vger.kernel.org, Joerg Roedel , David Woodhouse From: Bjorn Helgaas Cc: iommu@lists.linux-foundation.org, Gregor Dick Date: Mon, 20 Jul 2015 19:14:46 -0500 Message-ID: <20150721001446.28145.65839.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150721001243.28145.81610.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150721001243.28145.81610.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the pci_physfn() helper rather than looking up physfn by hand. No functional change. Signed-off-by: Bjorn Helgaas Reviewed-by: Joerg Roedel --- drivers/pci/ats.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c index 95905f3..0b5b0ed 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -42,6 +42,7 @@ void pci_ats_init(struct pci_dev *dev) int pci_enable_ats(struct pci_dev *dev, int ps) { u16 ctrl; + struct pci_dev *pdev; BUG_ON(dev->ats_cap && dev->ats_enabled); @@ -57,8 +58,7 @@ int pci_enable_ats(struct pci_dev *dev, int ps) */ ctrl = PCI_ATS_CTRL_ENABLE; if (dev->is_virtfn) { - struct pci_dev *pdev = dev->physfn; - + pdev = pci_physfn(dev); if (pdev->ats_stu != ps) return -EINVAL; @@ -80,6 +80,7 @@ EXPORT_SYMBOL_GPL(pci_enable_ats); */ void pci_disable_ats(struct pci_dev *dev) { + struct pci_dev *pdev; u16 ctrl; BUG_ON(!dev->ats_cap || !dev->ats_enabled); @@ -88,8 +89,7 @@ void pci_disable_ats(struct pci_dev *dev) return; /* VFs still enabled */ if (dev->is_virtfn) { - struct pci_dev *pdev = dev->physfn; - + pdev = pci_physfn(dev); atomic_dec(&pdev->ats_ref_cnt); }