[19/31] pci: Drop dm.h inclusion from header file

Message ID	20200719161601.495421-20-sjg@chromium.org
State	Accepted
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Masahiro Yamada <yamada.masahiro@socionext.com>, Simon Glass <sjg@chromium.org>, Masahiro Yamada <masahiroy@kernel.org>, Pankaj Bansal <pankaj.bansal@nxp.com>, Priyanka Jain <priyanka.jain@nxp.com>, Wasim Khan <wasim.khan@nxp.com> Subject: [PATCH 19/31] pci: Drop dm.h inclusion from header file Date: Sun, 19 Jul 2020 10:15:49 -0600 Message-Id: <20200719161601.495421-20-sjg@chromium.org> In-Reply-To: <20200719161601.495421-1-sjg@chromium.org> References: <20200719161601.495421-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	dm: Avoid including dm.h in header files \| expand [00/31] dm: Avoid including dm.h in header files [01/31] spi: Allow separate control of SPI_FLASH_TINY for SPL/TPL [02/31] mtd: spi-nor: Tidy up error handling / debug code [03/31] wdt: Drop dm.h header file [04/31] mtd: spi-mem: Drop dm.h header file [05/31] mtd: spi: Drop SPI_XFER_MMAP* [06/31] dm: core: Drop dm.h header file from dm-demo.h [07/31] dm: core: Drop header files from dm/test.h [08/31] fs: fs-loader: Drop dm.h header file [09/31] net: Drop dm.h header file from phy.h [10/31] sf: Drop dm.h header file from spi_flash.h [11/31] thermal: Drop dm.h header file [12/31] w1: Drop dm.h header file [13/31] efi: Tidy up header includes [14/31] power: Tidy up inclusion of regulator_common.h [15/31] mmc: Drop duplicate dm.h inclusion [16/31] spi: Drop duplicate dm.h inclusion [17/31] ti: am654: Drop duplicate dm.h inclusion [18/31] liebherr: Drop duplicate dm.h inclusion [19/31] pci: Drop dm.h inclusion from header file [20/31] mediatek: Drop dm.h header file [21/31] mscc: Drop dm.h header file [22/31] adc: Drop dm.h header file [23/31] nand: Drop dm.h header file [24/31] ufs: Drop dm.h header file [25/31] usb: Drop dm.h header file [26/31] clk: Drop dm.h header file in clk-provider.h [27/31] net: Drop dm.h header file in eth_phy.h [28/31] net: Drop duplicate include of dm.h in pcnet.c [29/31] dm: core: Guard against including dm.h in header files [30/31] patman: Fix up the test comments [31/31] checkpatch: Don't allow common.h and dm.h in headers

Message ID

20200719161601.495421-20-sjg@chromium.org

State

Accepted

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>,
 Masahiro Yamada <yamada.masahiro@socionext.com>,
 Simon Glass <sjg@chromium.org>, Masahiro Yamada <masahiroy@kernel.org>,
 Pankaj Bansal <pankaj.bansal@nxp.com>,
 Priyanka Jain <priyanka.jain@nxp.com>, Wasim Khan <wasim.khan@nxp.com>
Subject: [PATCH 19/31] pci: Drop dm.h inclusion from header file
Date: Sun, 19 Jul 2020 10:15:49 -0600
Message-Id: <20200719161601.495421-20-sjg@chromium.org>
In-Reply-To: <20200719161601.495421-1-sjg@chromium.org>
References: <20200719161601.495421-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

dm: Avoid including dm.h in header files | expand

Commit Message

Simon Glass July 19, 2020, 4:15 p.m. UTC

The layerscape header should not include dm.h so remove it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 drivers/pci/pcie_layerscape.h            | 1 -
 drivers/pci/pcie_layerscape_fixup.c      | 1 +
 drivers/pci/pcie_layerscape_gen4.h       | 1 -
 drivers/pci/pcie_layerscape_gen4_fixup.c | 1 +
 4 files changed, 2 insertions(+), 2 deletions(-)

Comments

Tom Rini Aug. 4, 2020, 3:05 p.m. UTC | #1

On Sun, Jul 19, 2020 at 10:15:49AM -0600, Simon Glass wrote:

> The layerscape header should not include dm.h so remove it.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

diff --git a/drivers/pci/pcie_layerscape.h b/drivers/pci/pcie_layerscape.h
index 95454bc188..ffbafbba51 100644
--- a/drivers/pci/pcie_layerscape.h
+++ b/drivers/pci/pcie_layerscape.h
@@ -8,7 +8,6 @@ 
 #ifndef _PCIE_LAYERSCAPE_H_
 #define _PCIE_LAYERSCAPE_H_
 #include <pci.h>
-#include <dm.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_BUS
 #define CONFIG_SYS_PCI_MEMORY_BUS CONFIG_SYS_SDRAM_BASE
diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index 76e680481a..5528df4db1 100644
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <dm.h>
 #include <init.h>
 #include <log.h>
 #include <pci.h>
diff --git a/drivers/pci/pcie_layerscape_gen4.h b/drivers/pci/pcie_layerscape_gen4.h
index d298a2b810..483eb538b5 100644
--- a/drivers/pci/pcie_layerscape_gen4.h
+++ b/drivers/pci/pcie_layerscape_gen4.h
@@ -9,7 +9,6 @@ 
 #ifndef _PCIE_LAYERSCAPE_GEN4_H_
 #define _PCIE_LAYERSCAPE_GEN4_H_
 #include <pci.h>
-#include <dm.h>
 #include <linux/bitops.h>
 
 #ifndef CONFIG_SYS_PCI_MEMORY_SIZE
diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c
index 375ce45839..148b5d17ed 100644
--- a/drivers/pci/pcie_layerscape_gen4_fixup.c
+++ b/drivers/pci/pcie_layerscape_gen4_fixup.c
@@ -8,6 +8,7 @@ 
  */
 
 #include <common.h>
+#include <dm.h>
 #include <log.h>
 #include <pci.h>
 #include <asm/arch/fsl_serdes.h>

[19/31] pci: Drop dm.h inclusion from header file

Commit Message

Comments

Patch