aboutsummaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorSimon Glass2023-04-25 10:54:43 -0600
committerTom Rini2023-04-27 13:51:06 -0400
commit209ee95611d1f77b341f68a79f94d07cd657667e (patch)
treecc0abcbbf80e6d940c0c23b380e4ce99e360e627 /drivers/block
parentb6483ea22355b097c061bd551bfcd5eb84a39e79 (diff)
ide: Make ide_bus_ok a local variable
This is only used in one place now, so make it a local variable. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/ide.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index aac4462f57b..36c726225d0 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -39,8 +39,6 @@ ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS] = {
#define ATA_CURR_BASE(dev) (CONFIG_SYS_ATA_BASE_ADDR + \
ide_bus_offset[IDE_BUS(dev)])
-static int ide_bus_ok[CONFIG_SYS_IDE_MAXBUS];
-
struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
#define IDE_TIME_OUT 2000 /* 2 sec timeout */
@@ -52,11 +50,6 @@ struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
#ifdef CONFIG_IDE_RESET
static void ide_reset(void)
{
- int i;
-
- for (i = 0; i < CONFIG_SYS_IDE_MAXBUS; ++i)
- ide_bus_ok[i] = 0;
-
ide_set_reset(1); /* assert reset */
/* the reset signal shall be asserted for et least 25 us */
@@ -728,6 +721,7 @@ static int ide_init_one(int bus)
static void ide_init(void)
{
+ bool bus_ok[CONFIG_SYS_IDE_MAXBUS];
int i, bus;
schedule();
@@ -740,7 +734,7 @@ static void ide_init(void)
* According to spec, this can take up to 31 seconds!
*/
for (bus = 0; bus < CONFIG_SYS_IDE_MAXBUS; ++bus) {
- ide_bus_ok[bus] = !ide_init_one(bus);
+ bus_ok[bus] = !ide_init_one(bus);
schedule();
}
@@ -755,7 +749,7 @@ static void ide_init(void)
ide_dev_desc[i].log2blksz =
LOG2_INVALID(typeof(ide_dev_desc[i].log2blksz));
ide_dev_desc[i].lba = 0;
- if (!ide_bus_ok[IDE_BUS(i)])
+ if (!bus_ok[IDE_BUS(i)])
continue;
ide_ident(&ide_dev_desc[i]);
dev_print(&ide_dev_desc[i]);