ide: cleanup ide_system_bus_speed() (537f06c5) · Commits · 戴 / test

drivers/ide/ide.c

+11 −17

Original line number	Diff line number	Diff line
		@@ -240,22 +240,12 @@ static int ide_system_bus_speed(void)
		#define pci_default 0
		#endif /* CONFIG_PCI */

		if (!system_bus_speed) {
		if (idebus_parameter) {
		/* user supplied value */
		system_bus_speed = idebus_parameter;
		} else if (pci_dev_present(pci_default)) {
		/* safe default value for PCI */
		system_bus_speed = 33;
		} else {
		/* 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;
		if (idebus_parameter)
		return idebus_parameter;

		/* safe default value for PCI or VESA and PCI*/
		return pci_dev_present(pci_default) ? 33 : 50;
		}

		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)
		{
		return((int) ((!system_bus_speed) ? ide_system_bus_speed() : system_bus_speed ));
		return system_bus_speed;
		}

		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");
		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);
		if (ret < 0) {
		printk(KERN_WARNING "IDE: bus_register error: %d\n", ret);