ide: Drop init for not using BLK

ALl boards use CONFIG_BLK now so this code is not used. Drop it and the
header-file #ifdef

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

diff --git a/common/board_r.c b/common/board_r.c
index 7076af64f5dece2a2a0e43458b8570b012aacb52..d798c00a80a5e1e026cf9ea53d028d46c57e1856 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -519,15 +519,6 @@ static int initr_post(void)
 }
 #endif
 
-#if defined(CONFIG_IDE) && !defined(CONFIG_BLK)
-static int initr_ide(void)
-{
-       puts("IDE:   ");
-       ide_init();
-       return 0;
-}
-#endif
-
 #if defined(CFG_PRAM)
 /*
  * Export available size of memory for Linux, taking into account the
@@ -778,9 +769,6 @@ static init_fnc_t init_sequence_r[] = {
 #ifdef CONFIG_POST
        initr_post,
 #endif
-#if defined(CONFIG_IDE) && !defined(CONFIG_BLK)
-       initr_ide,
-#endif
 #ifdef CONFIG_LAST_STAGE_INIT
        INIT_FUNC_WATCHDOG_RESET
        /*

diff --git a/include/ide.h b/include/ide.h
index 9c0d40364a8f8c238b8461467dd6ce79b7f7ce0d..457f275c61b442c0502e2abcf5129ea33b777b61 100644 (file)
--- a/include/ide.h
+++ b/include/ide.h
@@ -18,17 +18,10 @@
 void ide_init(void);
 struct blk_desc;
 struct udevice;
-#ifdef CONFIG_BLK
 ulong ide_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
               void *buffer);
 ulong ide_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
                const void *buffer);
-#else
-ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
-              void *buffer);
-ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
-               const void *buffer);
-#endif
 
 #if defined(CONFIG_OF_IDE_FIXUP)
 int ide_device_present(int dev);