summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-proc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-05 21:39:22 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-05 21:39:22 (GMT)
commit0eca52a92735f43462165efe00a7e394345fb38e (patch)
tree94c563b7ba022653d7b30092d3affa08235e0fd3 /drivers/ide/ide-proc.c
parent19d031e052bc213cdcbee70696d476136994b8c1 (diff)
parent24df31acaff8465d797f0006437b45ad0f2a5cb1 (diff)
downloadlinux-fsl-qoriq-0eca52a92735f43462165efe00a7e394345fb38e.tar.xz
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
Diffstat (limited to 'drivers/ide/ide-proc.c')
-rw-r--r--drivers/ide/ide-proc.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index 28d09a5..017c095 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[] = {
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)