At this point in time, <ide.h> provides the IDE_BUS macro and the
function prototype for ide_set_reset, which is used with IDE_RESET. The
only files which should include this header are the ones that either use
that macro or that function. Remove <blk.h> from <ide.h> and remove
<ide.h> from places which do not need it.
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
board/freescale/m5253demo/m5253demo.c | 1 +
board/imgtec/malta/malta.c | 1 -
cmd/ide.c | 1 -
common/board_r.c | 1 -
disk/part.c | 1 -
disk/part_amiga.c | 1 -
disk/part_dos.c | 1 -
disk/part_efi.c | 1 -
disk/part_mac.c | 1 -
include/ide.h | 2 --
include/part.h | 1 -
lib/efi_loader/efi_device_path.c | 1 +
12 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/board/freescale/m5253demo/m5253demo.c
b/board/freescale/m5253demo/m5253demo.c
index 446a79e67232..50c5320b55cb 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -93,6 +93,7 @@ int testdram(void)
#ifdef CONFIG_IDE
#include <ata.h>
+#include <ide.h>
void ide_set_reset(int idereset)
{
atac_t *ata = (atac_t *) CONFIG_SYS_ATA_BASE_ADDR;
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 4a72ab5cecad..0ffa964178f0 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -6,7 +6,6 @@
#include <config.h>
#include <fdt_support.h>
-#include <ide.h>
#include <init.h>
#include <net.h>
#include <netdev.h>
diff --git a/cmd/ide.c b/cmd/ide.c
index 036489fda979..ed30f9468660 100644
--- a/cmd/ide.c
+++ b/cmd/ide.c
@@ -19,7 +19,6 @@
#include <dm/device-internal.h>
#include <dm/uclass-internal.h>
-#include <ide.h>
#include <ata.h>
#ifdef CONFIG_LED_STATUS
diff --git a/common/board_r.c b/common/board_r.c
index b90a4d9ff695..a1183f0811dd 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -36,7 +36,6 @@
#include <env.h>
#include <env_internal.h>
#include <fdtdec.h>
-#include <ide.h>
#include <init.h>
#include <initcall.h>
#include <kgdb.h>
diff --git a/disk/part.c b/disk/part.c
index 303178161c08..9cbd03686f5d 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -8,7 +8,6 @@
#include <command.h>
#include <env.h>
#include <errno.h>
-#include <ide.h>
#include <log.h>
#include <malloc.h>
#include <part.h>
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 5b8ae5762d3a..22bf99f1b88c 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -6,7 +6,6 @@
*/
#include <command.h>
#include <env.h>
-#include <ide.h>
#include "part_amiga.h"
#include <part.h>
#include <vsprintf.h>
diff --git a/disk/part_dos.c b/disk/part_dos.c
index 96f748702fd5..5c77225cef93 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -15,7 +15,6 @@
#include <blk.h>
#include <command.h>
-#include <ide.h>
#include <memalign.h>
#include <vsprintf.h>
#include <asm/unaligned.h>
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 932d058c184c..68ba1d11e7b6 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -21,7 +21,6 @@
#include <asm/unaligned.h>
#include <command.h>
#include <fdtdec.h>
-#include <ide.h>
#include <malloc.h>
#include <memalign.h>
#include <part_efi.h>
diff --git a/disk/part_mac.c b/disk/part_mac.c
index 21c85942fd84..dd3ce0be832b 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -15,7 +15,6 @@
#include <command.h>
#include <log.h>
#include <memalign.h>
-#include <ide.h>
#include "part_mac.h"
#include <part.h>
diff --git a/include/ide.h b/include/ide.h
index 2c25e74ede08..550b33056213 100644
--- a/include/ide.h
+++ b/include/ide.h
@@ -7,8 +7,6 @@
#ifndef _IDE_H
#define _IDE_H
-#include <blk.h>
-
#define IDE_BUS(dev) (dev / (CONFIG_SYS_IDE_MAXDEVICE /
CONFIG_SYS_IDE_MAXBUS))
/**
diff --git a/include/part.h b/include/part.h
index fcb3c13dea4d..3fa2d8424b70 100644
--- a/include/part.h
+++ b/include/part.h
@@ -7,7 +7,6 @@
#define _PART_H
#include <blk.h>
-#include <ide.h>
#include <u-boot/uuid.h>
#include <linker_lists.h>
#include <linux/errno.h>
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index c9bf2726fe24..66a951a8c1bb 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -10,6 +10,7 @@
#include <blk.h>
#include <dm.h>
#include <dm/root.h>
+#include <ide.h>
#include <log.h>
#include <net.h>
#include <usb.h>
--
2.43.0
