History

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

Linus Torvalds committed 17 years ago

Commit 0eca52a2 parents 19d031e 24df31a2 files · +1 −16Browse files

Unified · Split

2 files
  1. drivers/ide/ide-probe.c +0 −9
  2. drivers/ide/ide-proc.c +1 −7
drivers/ide/ide-probe.c+0−9
@@ -1046,15 +1046,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif) · 1045 unmodified lines
1046 if (port_ops && port_ops->init_dev)1046 if (port_ops && port_ops->init_dev)
1047 port_ops->init_dev(drive);1047 port_ops->init_dev(drive);
1048 }1048 }
1049
1050 ide_port_for_each_dev(i, drive, hwif) {
1051 /*
1052 * default to PIO Mode 0 before we figure out
1053 * the most suited mode for the attached device
1054 */
1055 if (port_ops && port_ops->set_pio_mode)
1056 port_ops->set_pio_mode(drive, 0);
1057 }
1058}1049}
1059 1050
1060static void ide_init_port(ide_hwif_t *hwif, unsigned int port,1051static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
drivers/ide/ide-proc.c+1−7
@@ -273,14 +273,8 @@ static const struct ide_proc_devset ide_generic_settings[] = { · 272 unmodified lines
273 273
274static void proc_ide_settings_warn(void)274static void proc_ide_settings_warn(void)
275{275{
276 static int warned;276 printk_once(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is "
277
278 if (warned)
279 return;
280
281 printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is "
282 "obsolete, and will be removed soon!\n");277 "obsolete, and will be removed soon!\n");
283 warned = 1;
284}278}
285 279
286static int ide_settings_proc_show(struct seq_file *m, void *v)280static int ide_settings_proc_show(struct seq_file *m, void *v)