include/ide.h: Cleanup usage

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 <trini@konsulko.com>

diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 446a79e67232bce6186cf699d75d3cf6b8aac97b..50c5320b55cb330d4b4a99f82b259cf0c38f00f0 100644 (file)
--- 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 4a72ab5cecad5ffcaf6d2d98dcee4474de202e5f..0ffa964178f08f22116bb0eb4366cebf934247fd 100644 (file)
--- 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 036489fda979b8656cc9cd9f2a21867513c21e3c..ed30f94686605794d316ef4319cf4a62d146a725 100644 (file)
--- 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 b90a4d9ff695111481c5e8b3db8040013664f815..a1183f0811dd53b244044f6976c6400566a53d7d 100644 (file)
--- 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 303178161c083ec6e1b767b4f06ac5773576ca60..9cbd03686f5d03a35c20288bf16bb12cc976dc69 100644 (file)
--- 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 5b8ae5762d3a91e2089028c178995eb59057d9ea..22bf99f1b88c240d1885013c22b59e95e9bcbf70 100644 (file)
--- 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 96f748702fd5f9a410d49544a26ea91479ae9c56..5c77225cef93ca82b2f8e14897a80eeb427cb04e 100644 (file)
--- 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 932d058c184ce6946b7142e7c2d9637b28e4661e..68ba1d11e7b67ffe76bbc5e1bec03b649bf927e3 100644 (file)
--- 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 21c85942fd840b0e590e0ebc979cd2927ee781bd..dd3ce0be832b8bb22f5c7a16da92166a186e94a3 100644 (file)
--- 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 2c25e74ede08e478759cd536466543db8b38e718..550b330562131967cb4528749bc1c13dbb25135e 100644 (file)
--- 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 fcb3c13dea4de6346ad98d6ce320ef36747dda85..3fa2d8424b7032ef8fcd51dd05e65d2e98ceb5dd 100644 (file)
--- 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 c9bf2726fe244e98fc51e611fb0925d84d3c65c8..66a951a8c1bb5814df032060c06ca29127c61c8a 100644 (file)
--- 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>