Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1433781

[PATCH v4 16/22] pci: pci_config_window move to linux/pci.h

Show all headers | View raw

Chanegs v4
none

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 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 <linux/kernel.h>
 #include <linux/platform_device.h>
+#include <linux/pci.h>
 
 /*
  * 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 <linux/pci-dma-compat.h>
 
-- 
2.7.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 00/22] sh: LANDISK and R2Dplus convert to device tree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:00 +0200
  [PATCH v4 15/22] sh: Move common PCI stuff to arch/sh/kernel Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 04/22] sh: Use P1SEGADDR Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 13/22] sh: irqchip: SH7751 IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Arnd Bergmann <arnd@arndb.de> - 2016-06-29 17:00 +0200
      Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-30 17:00 +0200
    Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Rob Herring <robh@kernel.org> - 2016-07-01 03:50 +0200
  [PATCH v4 07/22] sh: Passing FDT address on zImage Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 18/22] sh: Add separate DTB build rule Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 09/22] sh: Use GENERIC_IOMAP on device tree mode Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 20/22] sh: IO-DATA HDL-U (a,k.a landisk) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus)  DeviceTree Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-06-29 16:20 +0200
      Re: [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-30 16:50 +0200
  [PATCH v4 17/22] pci: PCI_HOST_GENERIC enable for SH Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 05/22] sh: command line passing chosen/bootargs in devicetree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 16/22] pci: pci_config_window move to linux/pci.h Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 08/22] sh: Disable board specific code on device tree mode Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 14/22] sh: SH7751 core dtsi Geert Uytterhoeven <geert@linux-m68k.org> - 2016-07-01 11:00 +0200
      Re: [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-03 13:40 +0200
    Re: [PATCH v4 14/22] sh: SH7751 core dtsi Geert Uytterhoeven <geert@linux-m68k.org> - 2016-07-04 09:20 +0200
      Re: [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-04 18:20 +0200
  [PATCH v4 03/22] sh: set preset_lpj Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus)  IRQCHIP Driver Rob Herring <robh@kernel.org> - 2016-07-01 04:10 +0200
      Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-03 13:40 +0200
  [PATCH v4 02/22] sh: More early unflatten device tree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200

csiph-web