From patchwork Tue Aug 11 15:52:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6993131 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 8D71DC05AC for ; Tue, 11 Aug 2015 15:52:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A4937205B6 for ; Tue, 11 Aug 2015 15:52:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1896205D4 for ; Tue, 11 Aug 2015 15:52:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965264AbbHKPwa (ORCPT ); Tue, 11 Aug 2015 11:52:30 -0400 Received: from mail-ig0-f174.google.com ([209.85.213.174]:35696 "EHLO mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965209AbbHKPw3 (ORCPT ); Tue, 11 Aug 2015 11:52:29 -0400 Received: by igbjg10 with SMTP id jg10so24762538igb.0 for ; Tue, 11 Aug 2015 08:52:29 -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=w9rMb7xszvPh1boJ9RFq1SvPQijbKmHUmoIl5H34obs=; b=R0Br6gccuGUcde7WmKZ2Ko0nXEetWXFEBVmvA7wSSy+zEK+b/JZ/ETAIXC8knONO2P BPQ6txylVpAvg71xm43ekaTUDFg3ZEQyj9LT0MDr3iwSNJkWJytJ3mH6a9zPgN8rR3wV ekX+lQyYHAsMpUnUV8y42rqRao/mBf2+3ZbRe6Mu09SL/hfTDjKqUjpvppUhiRP7Whvj ZFSdJDry8kko/rMoeBefhlZ+7nmnRY+cjVx/IQ75krmBv9UNuPGLwH8Uq8JqzyTR4QYl KAelqISP9SybfGUxAayOYv++74gZ6aC9AfM4A0qaS+C159ikQRd7KjqFn/QMiC3dJ2n+ 4RdQ== 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=w9rMb7xszvPh1boJ9RFq1SvPQijbKmHUmoIl5H34obs=; b=QGrTD/z+6eTG1xhGeA/UkcYl7qcDMcaH78z7aK+86j7/PtyO1tTd5R164HLj3yLwsp fYtItWjy/DRAx3gn9U4cmWabPT0LD7CHCWTPpWd/Ljl+ngKgtAb3dj9mZ5kWs5sh/v4P XwLiZXZ7ZzIvhigvw/9FZn2hecktsW/xLwZ/FFughKSHbZuzGG18tSgGdr9UYPy0+gEk W6Xo/moYgqQkhdJsdAeZeCrO/g+yfTm8WLiFd2Z7MNMfyNpLwnjmAhYGVU3UGnU5QXSm RlLF+tw1+GUd1hyghO2cpgv9YwwVKTgAiYcVRaQPDLOtp0cXe/beaOoBCdYCfx8k1NG6 jwRg== X-Gm-Message-State: ALoCoQmTM4xScKdMx24NEfGHNrbgjqMznWgMJlx7ROgu0FL8OHhgm6u3clDyyEJn/Nk66qmRN2R1 X-Received: by 10.50.83.98 with SMTP id p2mr17617629igy.72.1439308348982; Tue, 11 Aug 2015 08:52:28 -0700 (PDT) Received: from localhost ([2620:0:1007:b:254d:7b22:9adf:e278]) by smtp.gmail.com with ESMTPSA id q12sm8463697igr.2.2015.08.11.08.52.27 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Aug 2015 08:52:27 -0700 (PDT) Subject: [PATCH v3 11/11] PCI: Remove pci_ats_enabled() To: linux-pci@vger.kernel.org, Joerg Roedel , David Woodhouse From: Bjorn Helgaas Cc: Gregor Dick , iommu@lists.linux-foundation.org, Yinghai Lu Date: Tue, 11 Aug 2015 10:52:26 -0500 Message-ID: <20150811155226.21078.27244.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150811154525.21078.85310.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150811154525.21078.85310.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=-7.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=unavailable 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 Remove pci_ats_enabled(). There are no callers outside the ATS code itself. We don't need to check ats_cap, because if we don't find an ATS capability, we'll never set ats_enabled. Signed-off-by: Bjorn Helgaas Reviewed-by: Joerg Roedel --- drivers/pci/ats.c | 8 ++++---- include/linux/pci.h | 2 -- 2 files changed, 4 insertions(+), 6 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 4b17cf5..94976b4 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -43,8 +43,8 @@ int pci_enable_ats(struct pci_dev *dev, int ps) if (!dev->ats_cap) return -EINVAL; - WARN_ON(pci_ats_enabled(dev)); - if (pci_ats_enabled(dev)) + WARN_ON(dev->ats_enabled); + if (dev->ats_enabled) return -EBUSY; if (ps < PCI_ATS_MIN_STU) @@ -81,7 +81,7 @@ void pci_disable_ats(struct pci_dev *dev) struct pci_dev *pdev; u16 ctrl; - if (!pci_ats_enabled(dev)) + if (!dev->ats_enabled) return; if (atomic_read(&dev->ats_ref_cnt)) @@ -104,7 +104,7 @@ void pci_restore_ats_state(struct pci_dev *dev) { u16 ctrl; - if (!pci_ats_enabled(dev)) + if (!dev->ats_enabled) return; ctrl = PCI_ATS_CTRL_ENABLE; diff --git a/include/linux/pci.h b/include/linux/pci.h index 4b484fd..806da76 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1303,13 +1303,11 @@ void pci_ats_init(struct pci_dev *dev); int pci_enable_ats(struct pci_dev *dev, int ps); void pci_disable_ats(struct pci_dev *dev); int pci_ats_queue_depth(struct pci_dev *dev); -static inline int pci_ats_enabled(struct pci_dev *dev) { return dev->ats_cap && dev->ats_enabled; } #else static inline void pci_ats_init(struct pci_dev *d) { } static inline int pci_enable_ats(struct pci_dev *d, int ps) { return -ENODEV; } static inline void pci_disable_ats(struct pci_dev *d) { } static inline int pci_ats_queue_depth(struct pci_dev *d) { return -ENODEV; } -static inline int pci_ats_enabled(struct pci_dev *d) { return 0; } #endif void pci_cfg_access_lock(struct pci_dev *dev);