block: ide: Remove ide_preinit function

The only platform currently that defines an ide_preinit function has an
empty one that immediately returns.  Remove this hook.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c
index 2a47035..85f5f0c 100644 (file)
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/freescale/m5253demo/m5253demo.c
@@ -93,11 +93,6 @@ int testdram(void)
 
 #ifdef CONFIG_IDE
 #include <ata.h>
-int ide_preinit(void)
-{
-       return (0);
-}
-
 void ide_set_reset(int idereset)
 {
        atac_t *ata = (atac_t *) CONFIG_SYS_ATA_BASE_ADDR;

diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index e8518ff..3270a9f 100644 (file)
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -695,15 +695,6 @@ void ide_init(void)
        unsigned char c;
        int i, bus;
 
-#ifdef CONFIG_IDE_PREINIT
-       WATCHDOG_RESET();
-
-       if (ide_preinit()) {
-               puts("ide_preinit failed\n");
-               return;
-       }
-#endif /* CONFIG_IDE_PREINIT */
-
        WATCHDOG_RESET();
 
        /* ATAPI Drives seems to need a proper IDE Reset */

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 384217a..840d3b4 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -19,11 +19,6 @@
        . = DEFINED(env_offset) ? env_offset : .; \
        env/embedded.o(.text*);
 
-#ifdef CONFIG_IDE
-/* ATA */
-#      define CONFIG_IDE_PREINIT       1
-#endif
-
 #ifdef CONFIG_DRIVER_DM9000
 #      define CONFIG_DM9000_BASE       (CONFIG_SYS_CS1_BASE | 0x300)
 #      define DM9000_IO                CONFIG_DM9000_BASE

diff --git a/include/ide.h b/include/ide.h
index 2994b7a..426cef4 100644 (file)
--- a/include/ide.h
+++ b/include/ide.h
@@ -33,10 +33,6 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
                const void *buffer);
 #endif
 
-#ifdef CONFIG_IDE_PREINIT
-int ide_preinit(void);
-#endif
-
 #if defined(CONFIG_OF_IDE_FIXUP)
 int ide_device_present(int dev);
 #endif