From patchwork Wed Jun 29 13:41:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 642078 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rfkx15sblz9sC4 for ; Thu, 30 Jun 2016 00:06:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753176AbcF2OEr (ORCPT ); Wed, 29 Jun 2016 10:04:47 -0400 Received: from mail2.asahi-net.or.jp ([202.224.39.198]:64582 "EHLO mail2.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752466AbcF2NlQ (ORCPT ); Wed, 29 Jun 2016 09:41:16 -0400 Received: from sa76r4 (y081184.ppp.asahi-net.or.jp [118.243.81.184]) by mail2.asahi-net.or.jp (Postfix) with ESMTP id F2EC3B1D6; Wed, 29 Jun 2016 22:41:12 +0900 (JST) Received: from localhost (localhost [127.0.0.1]) by sa76r4 (Postfix) with ESMTP id F234312D44; Wed, 29 Jun 2016 22:41:12 +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 f-dTOHFMgZ9u; Wed, 29 Jun 2016 22:41:12 +0900 (JST) Received: by sa76r4 (Postfix, from userid 1000) id ACA1412D3F; Wed, 29 Jun 2016 22:41:12 +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 v4 16/22] pci: pci_config_window move to linux/pci.h Date: Wed, 29 Jun 2016 22:41:01 +0900 Message-Id: <1467207667-15768-17-git-send-email-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1467207667-15768-1-git-send-email-ysato@users.sourceforge.jp> References: <1467207667-15768-1-git-send-email-ysato@users.sourceforge.jp> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Chanegs v4 none 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