From patchwork Tue Jul 21 00:15:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6831531 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 C2F6FC05AC for ; Tue, 21 Jul 2015 00:15:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB9DD2069F for ; Tue, 21 Jul 2015 00:15:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 165B72064E for ; Tue, 21 Jul 2015 00:15:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757435AbbGUAPX (ORCPT ); Mon, 20 Jul 2015 20:15:23 -0400 Received: from mail-ig0-f178.google.com ([209.85.213.178]:38059 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757286AbbGUAPW (ORCPT ); Mon, 20 Jul 2015 20:15:22 -0400 Received: by iggf3 with SMTP id f3so94284711igg.1 for ; Mon, 20 Jul 2015 17:15:22 -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=3fXbylExCZIOtlEPMFo47UYAvrmdciKrShSIihyFKyQ=; b=VGcx86kmJOL4oysX6R00gifRhOmlH/GVwNEeAq0xWBqsMtPk/bGB2uC1tIQ8t/KTsk zvNcjzxS4SsuQeq6EbXfyIsPEW3rQFcHne1KC4bBi35e8YAFzgJWFyYbm5A7hfom/eQA I3M8/1DF+wCpvcd6qQsVuvHOZYUcAKdYe2hIqsj0SstMKQ6eOJh2DOxge5W0ikq4EpcV KIdQHncmlNopGbJHeeHOqfr4F0ZmSBZ2xOks02cIqDKmv3FHjypKl9zo6sHmJcyzu8ub z20LwN1czebw1goRa3RPWlfwkvqApxSTh3H0C7rKsF9F6y4JX7a2+gwOkM/9Mu6MW3L8 9zCg== 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=3fXbylExCZIOtlEPMFo47UYAvrmdciKrShSIihyFKyQ=; b=cD/mXBorvZ5rpdlf42ugjL1AhlHxX+T+bK7q7fF5NIS2OBqL+DsCE8vQojYV3uY32w 41Blaq+x/te/csGZy8yWME0gBvARextrQkmUVYEzpkVhSkHuUU2w/iywYntnY4RgUNMV nEJsYkRfYuP0MBEFO3nd5UaXz2fQ1xZohWvZ5yQRMxT55vHAUKd6DQUw7IJ4IEkVh8kS jupLfJ+oJQkITskHMqP8l7wPMgcl0GBW6dgRsDmumG15rcdgnQsoNPOny9srGhnWOMo/ wjPlgcakx76XSfJul6pLI07+61Z48i3Z4BFUI2heWStF9o+hT15tSTFCl7GZtpSOBYiV gZdA== X-Gm-Message-State: ALoCoQk9MZO+AVr66F1LOQ8UH0CxNUaHOsMIkRtKDzbu7jmqxRleV/6AeoIRjEVQ27EhOd7X9d+m X-Received: by 10.50.43.197 with SMTP id y5mr18755161igl.27.1437437722277; Mon, 20 Jul 2015 17:15:22 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id t66sm10936801ioi.32.2015.07.20.17.15.20 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 20 Jul 2015 17:15:21 -0700 (PDT) Subject: [PATCH v2 11/11] PCI: Remove pci_ats_enabled() 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:15:19 -0500 Message-ID: <20150721001519.28145.73458.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=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 | 6 +++--- include/linux/pci.h | 2 -- 2 files changed, 3 insertions(+), 5 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 bdb1383..7a1c88f 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -43,7 +43,7 @@ int pci_enable_ats(struct pci_dev *dev, int ps) if (!dev->ats_cap) return -EINVAL; - if (pci_ats_enabled(dev)) + if (dev->ats_enabled) return -EINVAL; if (ps < PCI_ATS_MIN_STU) @@ -80,7 +80,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)) @@ -103,7 +103,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);