From 9666de8332a59ff53544ffeee7f864c56a99791a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 25 Apr 2023 10:54:52 -0600 Subject: [PATCH] ide: Tidy up ide_reset() Avoid using #ifdef and use a single function declaration, so it is easier to read. Signed-off-by: Simon Glass --- drivers/block/ide.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/block/ide.c b/drivers/block/ide.c index 72216540d0..fb40933878 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -45,24 +45,23 @@ ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS] = { #define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */ -#ifdef CONFIG_IDE_RESET static void ide_reset(void) { - ide_set_reset(1); /* assert reset */ + if (IS_ENABLED(CONFIG_IDE_RESET)) { + /* assert reset */ + ide_set_reset(1); - /* the reset signal shall be asserted for et least 25 us */ - udelay(25); + /* the reset signal shall be asserted for et least 25 us */ + udelay(25); - schedule(); + schedule(); - /* de-assert RESET signal */ - ide_set_reset(0); + /* de-assert RESET signal */ + ide_set_reset(0); - mdelay(250); + mdelay(250); + } } -#else -#define ide_reset() /* dummy */ -#endif /* CONFIG_IDE_RESET */ static void ide_outb(int dev, int port, unsigned char val) { -- 2.39.5