mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: Revert "ide: try to use PIO Mode 0 during probe if possible" ide: use printk_once
This commit is contained in:
commit
0eca52a927
2 changed files with 1 additions and 16 deletions
|
@ -1046,15 +1046,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
|
|||
if (port_ops && port_ops->init_dev)
|
||||
port_ops->init_dev(drive);
|
||||
}
|
||||
|
||||
ide_port_for_each_dev(i, drive, hwif) {
|
||||
/*
|
||||
* default to PIO Mode 0 before we figure out
|
||||
* the most suited mode for the attached device
|
||||
*/
|
||||
if (port_ops && port_ops->set_pio_mode)
|
||||
port_ops->set_pio_mode(drive, 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
|
||||
|
|
|
@ -273,14 +273,8 @@ static const struct ide_proc_devset ide_generic_settings[] = {
|
|||
|
||||
static void proc_ide_settings_warn(void)
|
||||
{
|
||||
static int warned;
|
||||
|
||||
if (warned)
|
||||
return;
|
||||
|
||||
printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is "
|
||||
printk_once(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is "
|
||||
"obsolete, and will be removed soon!\n");
|
||||
warned = 1;
|
||||
}
|
||||
|
||||
static int ide_settings_proc_show(struct seq_file *m, void *v)
|
||||
|
|
Loading…
Reference in a new issue