diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 17:39:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 17:39:22 -0400 |
commit | 0eca52a92735f43462165efe00a7e394345fb38e (patch) | |
tree | 94c563b7ba022653d7b30092d3affa08235e0fd3 | |
parent | 19d031e052bc213cdcbee70696d476136994b8c1 (diff) | |
parent | 24df31acaff8465d797f0006437b45ad0f2a5cb1 (diff) |
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
-rw-r--r-- | drivers/ide/ide-probe.c | 9 | ||||
-rw-r--r-- | drivers/ide/ide-proc.c | 8 |
2 files changed, 1 insertions, 16 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 63c53d65e875..4d76ba473097 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1046,15 +1046,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif) | |||
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 | ||
1060 | static void ide_init_port(ide_hwif_t *hwif, unsigned int port, | 1051 | static void ide_init_port(ide_hwif_t *hwif, unsigned int port, |
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 28d09a5d8450..017c09540c2f 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c | |||
@@ -273,14 +273,8 @@ static const struct ide_proc_devset ide_generic_settings[] = { | |||
273 | 273 | ||
274 | static void proc_ide_settings_warn(void) | 274 | static 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 | ||
286 | static int ide_settings_proc_show(struct seq_file *m, void *v) | 280 | static int ide_settings_proc_show(struct seq_file *m, void *v) |