hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Linus Torvalds 2009-10-05 14:39:22 -07:00
parent 19d031e052 24df31acaf
commit 0eca52a927
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/ide/ide-probe.c
View File

@ -1046,15 +1046,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
if (port_ops && port_ops->init_dev) if (port_ops && port_ops->init_dev)
port_ops->init_dev(drive); 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, static void ide_init_port(ide_hwif_t *hwif, unsigned int port,

8
drivers/ide/ide-proc.c
View File

@ -273,14 +273,8 @@ static const struct ide_proc_devset ide_generic_settings[] = {
static void proc_ide_settings_warn(void) static void proc_ide_settings_warn(void)
{ {
static int warned; printk_once(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is "
if (warned)
return;
printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is "
"obsolete, and will be removed soon!\n"); "obsolete, and will be removed soon!\n");
warned = 1;
} }
static int ide_settings_proc_show(struct seq_file *m, void *v) static int ide_settings_proc_show(struct seq_file *m, void *v)