lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: cleanup ide_system_bus_speed()

Browse Source 
Use the facts that:

* When ide_init() is called 'system_bus_speed' always equals zero.

* system_bus_clock() is never called before ide_init().

and:

* Move printk() from ide_system_bus_speed() to ide_init().

* Don't assign 'system_bus_speed' in ide_system_bus_speed().

* Don't call ide_system_bus_speed() in system_bus_clock().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-02-01 23:09:35 +01:00
parent 422278ef95
commit 537f06c5de
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/ide/ide.c
View File

@@ -240,22 +240,12 @@ static int ide_system_bus_speed(void)
#define pci_default 0 #define pci_default 0
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
if (!system_bus_speed) {
if (idebus_parameter) {
/* user supplied value */ /* user supplied value */
system_bus_speed = idebus_parameter; if (idebus_parameter)
} else if (pci_dev_present(pci_default)) { return idebus_parameter;
/* safe default value for PCI */
system_bus_speed = 33; /* safe default value for PCI or VESA and PCI*/
} else { return pci_dev_present(pci_default) ? 33 : 50;
/* safe default value for VESA and PCI */
system_bus_speed = 50;
}
printk(KERN_INFO "ide: Assuming %dMHz system bus speed "
"for PIO modes%s\n", system_bus_speed,
idebus_parameter ? "" : "; override with idebus=xx");
}
return system_bus_speed;
} }
ide_hwif_t * ide_find_port(unsigned long base) ide_hwif_t * ide_find_port(unsigned long base)
@@ -912,7 +902,7 @@ static int set_unmaskirq(ide_drive_t *drive, int arg)
int system_bus_clock (void) int system_bus_clock (void)
{ {
return((int) ((!system_bus_speed) ? ide_system_bus_speed() : system_bus_speed )); return system_bus_speed;
} }
EXPORT_SYMBOL(system_bus_clock); EXPORT_SYMBOL(system_bus_clock);
@@ -1667,6 +1657,10 @@ static int __init ide_init(void)
printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n"); printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n");
system_bus_speed = ide_system_bus_speed(); system_bus_speed = ide_system_bus_speed();
printk(KERN_INFO "ide: Assuming %dMHz system bus speed "
"for PIO modes%s\n", system_bus_speed,
idebus_parameter ? "" : "; override with idebus=xx");
ret = bus_register(&ide_bus_type); ret = bus_register(&ide_bus_type);
if (ret < 0) { if (ret < 0) {
printk(KERN_WARNING "IDE: bus_register error: %d\n", ret); printk(KERN_WARNING "IDE: bus_register error: %d\n", ret);