colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ide: Make ide_bus_ok a local variable

Browse Source 
This is only used in one place now, so make it a local variable.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-04-25 10:54:43 -06:00
committed by Tom Rini
parent b6483ea223
commit 209ee95611
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/block/ide.c
View File

@@ -39,8 +39,6 @@ ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS] = {
#define ATA_CURR_BASE(dev) (CONFIG_SYS_ATA_BASE_ADDR + \ #define ATA_CURR_BASE(dev) (CONFIG_SYS_ATA_BASE_ADDR + \
ide_bus_offset[IDE_BUS(dev)]) 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]; struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
#define IDE_TIME_OUT 2000 /* 2 sec timeout */ #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 #ifdef CONFIG_IDE_RESET
static void ide_reset(void) 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 */ ide_set_reset(1); /* assert reset */
/* the reset signal shall be asserted for et least 25 us */ /* 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) static void ide_init(void)
{ {
bool bus_ok[CONFIG_SYS_IDE_MAXBUS];
int i, bus; int i, bus;
schedule(); schedule();
@@ -740,7 +734,7 @@ static void ide_init(void)
* According to spec, this can take up to 31 seconds! * According to spec, this can take up to 31 seconds!
*/ */
for (bus = 0; bus < CONFIG_SYS_IDE_MAXBUS; ++bus) { 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(); schedule();
} }
@@ -755,7 +749,7 @@ static void ide_init(void)
ide_dev_desc[i].log2blksz = ide_dev_desc[i].log2blksz =
LOG2_INVALID(typeof(ide_dev_desc[i].log2blksz)); LOG2_INVALID(typeof(ide_dev_desc[i].log2blksz));
ide_dev_desc[i].lba = 0; ide_dev_desc[i].lba = 0;
if (!ide_bus_ok[IDE_BUS(i)]) if (!bus_ok[IDE_BUS(i)])
continue; continue;
ide_ident(&ide_dev_desc[i]); ide_ident(&ide_dev_desc[i]);
dev_print(&ide_dev_desc[i]); dev_print(&ide_dev_desc[i]);