Commit 0eca52a92735f43462165efe00a7e394345fb38e
Exists in
master
and in
4 other branches
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
Showing 2 changed files Side-by-side Diff
drivers/ide/ide-probe.c
| ... | ... | @@ -1046,15 +1046,6 @@ |
| 1046 | 1046 | if (port_ops && port_ops->init_dev) |
| 1047 | 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 | |
| 1060 | 1051 | static void ide_init_port(ide_hwif_t *hwif, unsigned int port, |
drivers/ide/ide-proc.c
| ... | ... | @@ -273,14 +273,8 @@ |
| 273 | 273 | |
| 274 | 274 | static void proc_ide_settings_warn(void) |
| 275 | 275 | { |
| 276 | - static int warned; | |
| 277 | - | |
| 278 | - if (warned) | |
| 279 | - return; | |
| 280 | - | |
| 281 | - printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is " | |
| 276 | + printk_once(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is " | |
| 282 | 277 | "obsolete, and will be removed soon!\n"); |
| 283 | - warned = 1; | |
| 284 | 278 | } |
| 285 | 279 | |
| 286 | 280 | static int ide_settings_proc_show(struct seq_file *m, void *v) |