[U-Boot,15/30] w1: Drop dm.h header file

Message ID	20191027155410.187957-15-sjg@chromium.org
State	Superseded
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> Date: Sun, 27 Oct 2019 09:53:55 -0600 Message-Id: <20191027155410.187957-15-sjg@chromium.org> In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Joe Hershberger <joe.hershberger@ni.com>, Tom Rini <trini@konsulko.com>, Martin Fuzzey <martin.fuzzey@flowbird.group> Subject: [U-Boot] [PATCH 15/30] w1: Drop dm.h header file Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	[U-Boot,01/30] lib: Allow crc32 to be disabled. \| expand [U-Boot,01/30] lib: Allow crc32 to be disabled. [U-Boot,02/30] spi: Allow separate control of SPI_FLASH_TINY for SPL/TPL [U-Boot,03/30] mtd: spi-nor: Tidy up error handling / debug code [U-Boot,04/30] mtd: spi: Export spi_flash_std_probe() [U-Boot,05/30] wdt: Move code out of the header [U-Boot,06/30] wdt: Drop dm.h header file [U-Boot,07/30] mtd: spi-mem: Drop dm.h header file [U-Boot,08/30] mtd: spi: Drop SPI_XFER_MMAP* [U-Boot,09/30] dm: core: Drop dm.h header file from dm-demo.h [U-Boot,10/30] dm: core: Drop header files from dm/test.h [U-Boot,11/30] fs: fs-loader: Drop dm.h header file [U-Boot,12/30] net: Drop dm.h header file from phy.h [U-Boot,13/30] sf: Drop dm.h header file from spi_flash.h [U-Boot,14/30] thermal: Drop dm.h header file [U-Boot,15/30] w1: Drop dm.h header file [U-Boot,16/30] efi: Tidy up header includes [U-Boot,17/30] power: Tidy up inclusion of regulator_common.h [U-Boot,18/30] mmc: Drop duplicate dm.h inclusion [U-Boot,19/30] spi: Drop duplicate dm.h inclusion [U-Boot,20/30] ti: am654: Drop duplicate dm.h inclusion [U-Boot,21/30] liebherr: Drop duplicate dm.h inclusion [U-Boot,22/30] pci: Drop dm.h inclusion from header file [U-Boot,23/30] video: meson: Drop unnecessary header includes [U-Boot,24/30] mediatek: Drop dm.h header file [U-Boot,25/30] mscc: Drop dm.h header file [U-Boot,26/30] adc: Drop dm.h header file [U-Boot,27/30] nand: Drop dm.h header file [U-Boot,28/30] ufs: Drop dm.h header file [U-Boot,29/30] usb: Drop dm.h header file [U-Boot,30/30] dm: core: Guard against including dm.h in header files

Message ID

20191027155410.187957-15-sjg@chromium.org

State

Superseded

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Date: Sun, 27 Oct 2019 09:53:55 -0600
Message-Id: <20191027155410.187957-15-sjg@chromium.org>
In-Reply-To: <20191027155410.187957-1-sjg@chromium.org>
References: <20191027155410.187957-1-sjg@chromium.org>
MIME-Version: 1.0
Cc: Joe Hershberger <joe.hershberger@ni.com>, Tom Rini <trini@konsulko.com>, 
	Martin Fuzzey <martin.fuzzey@flowbird.group>
Subject: [U-Boot] [PATCH 15/30] w1: Drop dm.h header file
Precedence: list
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

[U-Boot,01/30] lib: Allow crc32 to be disabled. | expand

Commit Message

Simon Glass Oct. 27, 2019, 3:53 p.m. UTC

This header file should not be included in other header files. Remove it
and use a forward declaration instead.

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

 board/atmel/common/board.c | 1 +
 cmd/w1.c                   | 1 +
 include/w1.h               | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
index c41706c400..eee5c357bd 100644
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <dm.h>
 #include <env.h>
 #include <w1.h>
 #include <w1-eeprom.h>
diff --git a/cmd/w1.c b/cmd/w1.c
index 9c95fcf9cd..c7e2b62bfa 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -6,6 +6,7 @@ 
  */
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
diff --git a/include/w1.h b/include/w1.h
index b958b1c92c..77f439e587 100644
--- a/include/w1.h
+++ b/include/w1.h
@@ -8,7 +8,7 @@ 
 #ifndef __W1_H
 #define __W1_H
 
-#include <dm.h>
+struct udevice;
 
 #define W1_FAMILY_DS24B33	0x23
 #define W1_FAMILY_DS2431	0x2d

[U-Boot,15/30] w1: Drop dm.h header file

Commit Message

Patch