| Message ID | 1504367034-1000-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | f1823d3aaa72cff4f6e979e3c4e4362c3ccc0751 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/3] block: ide: Drop CONFIG_IDE_INIT_POSTRESET | expand |
On Sat, Sep 02, 2017 at 08:43:52AM -0700, Bin Meng wrote: > This is not referenced anywhere. Drop it. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Applied to u-boot/master, thanks!
diff --git a/drivers/block/ide.c b/drivers/block/ide.c index edcf87b..cea0397 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -792,15 +792,6 @@ void ide_init(void) /* ATAPI Drives seems to need a proper IDE Reset */ ide_reset(); -#ifdef CONFIG_IDE_INIT_POSTRESET - WATCHDOG_RESET(); - - if (ide_init_postreset()) { - puts("ide_preinit_postreset failed\n"); - return; - } -#endif /* CONFIG_IDE_INIT_POSTRESET */ - /* * Wait for IDE to get ready. * According to spec, this can take up to 31 seconds! diff --git a/include/ide.h b/include/ide.h index 9b0a4a9..a4be763 100644 --- a/include/ide.h +++ b/include/ide.h @@ -51,10 +51,6 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, int ide_preinit(void); #endif -#ifdef CONFIG_IDE_INIT_POSTRESET -int ide_init_postreset(void); -#endif - #if defined(CONFIG_OF_IDE_FIXUP) int ide_device_present(int dev); #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 84dc5c9..440f740 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1080,7 +1080,6 @@ CONFIG_I2C_RTC_ADDR CONFIG_I2C_TIMEOUT CONFIG_ICACHE CONFIG_ICS307_REFCLK_HZ -CONFIG_IDE_INIT_POSTRESET CONFIG_IDE_LED CONFIG_IDE_PCMCIA CONFIG_IDE_PREINIT
This is not referenced anywhere. Drop it. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- drivers/block/ide.c | 9 --------- include/ide.h | 4 ---- scripts/config_whitelist.txt | 1 - 3 files changed, 14 deletions(-)