From patchwork Tue Jun 28 06:36:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 9202037 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7F1D06074E for ; Tue, 28 Jun 2016 06:37:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F4F3285F3 for ; Tue, 28 Jun 2016 06:37:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6254F285F1; Tue, 28 Jun 2016 06:37:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12BFE285F1 for ; Tue, 28 Jun 2016 06:37:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752248AbcF1Ggz (ORCPT ); Tue, 28 Jun 2016 02:36:55 -0400 Received: from mail1.asahi-net.or.jp ([202.224.39.197]:58287 "EHLO mail1.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbcF1Ggo (ORCPT ); Tue, 28 Jun 2016 02:36:44 -0400 Received: from sa76r4 (y081184.ppp.asahi-net.or.jp [118.243.81.184]) by mail1.asahi-net.or.jp (Postfix) with ESMTP id E65C3E60F; Tue, 28 Jun 2016 15:36:38 +0900 (JST) Received: from localhost (localhost [127.0.0.1]) by sa76r4 (Postfix) with ESMTP id D09D312D37; Tue, 28 Jun 2016 15:36:38 +0900 (JST) X-Virus-Scanned: Debian amavisd-new at sa76r4.localdomain Received: from sa76r4 ([127.0.0.1]) by localhost (sa76r4.localdomain [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S0JGFu_IsQ1Y; Tue, 28 Jun 2016 15:36:38 +0900 (JST) Received: by sa76r4 (Postfix, from userid 1000) id AF4C412D20; Tue, 28 Jun 2016 15:36:38 +0900 (JST) From: Yoshinori Sato To: linux-pci@vger.kernel.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Yoshinori Sato Subject: [PATCH v3 15/19] pci: pci_config_window move to linux/pci.h Date: Tue, 28 Jun 2016 15:36:31 +0900 Message-Id: <1467095795-5082-16-git-send-email-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1467095795-5082-1-git-send-email-ysato@users.sourceforge.jp> References: <1467095795-5082-1-git-send-email-ysato@users.sourceforge.jp> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Yoshinori Sato --- drivers/pci/ecam.h | 17 +---------------- include/linux/pci.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/drivers/pci/ecam.h b/drivers/pci/ecam.h index 9878beb..f110091 100644 --- a/drivers/pci/ecam.h +++ b/drivers/pci/ecam.h @@ -18,6 +18,7 @@ #include #include +#include /* * struct to hold pci ops and bus shift of the config window @@ -31,22 +32,6 @@ struct pci_ecam_ops { struct pci_config_window *); }; -/* - * struct to hold the mappings of a config space window. This - * is expected to be used as sysdata for PCI controllers that - * use ECAM. - */ -struct pci_config_window { - struct resource res; - struct resource busr; - void *priv; - struct pci_ecam_ops *ops; - union { - void __iomem *win; /* 64-bit single mapping */ - void __iomem **winp; /* 32-bit per-bus mapping */ - }; -}; - /* create and free pci_config_window */ struct pci_config_window *pci_ecam_create(struct device *dev, struct resource *cfgres, struct resource *busr, diff --git a/include/linux/pci.h b/include/linux/pci.h index b67e4df..398896f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2026,6 +2026,24 @@ static inline bool pci_ari_enabled(struct pci_bus *bus) return bus->self && bus->self->ari_enabled; } +/* + * struct to hold the mappings of a config space window. This + * is expected to be used as sysdata for PCI controllers that + * use ECAM. + */ +struct pci_ecam_ops; + +struct pci_config_window { + struct resource res; + struct resource busr; + void *priv; + struct pci_ecam_ops *ops; + union { + void __iomem *win; /* 64-bit single mapping */ + void __iomem **winp; /* 32-bit per-bus mapping */ + }; +}; + /* provide the legacy pci_dma_* API */ #include