diff options
author | Dave Jones <davej@redhat.com> | 2007-07-06 14:59:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-07 16:53:13 -0400 |
commit | 38377be88ab878f44c687dbd704d4d044b000c97 (patch) | |
tree | 2a4952419a9597adbc89d6f508b58dcbf507fd6f /arch | |
parent | 40e48eed84e65f909f5ac3d7a39547b70aacf90f (diff) |
Clean up E7520/7320/7525 quirk printk.
The printk level in this printk is bogus, as the previous printk
didn't have a terminating \n resulting in ..
Intel E7520/7320/7525 detected.<6>Disabling irq balancing and affinity
It also never printed a \n at all in the case where we didn't do
the quirk.
Change it to only make noise if it actually does something useful.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/quirks.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/i386/kernel/quirks.c b/arch/i386/kernel/quirks.c index 9f6ab1789bb0..6722469c2633 100644 --- a/arch/i386/kernel/quirks.c +++ b/arch/i386/kernel/quirks.c | |||
@@ -20,8 +20,6 @@ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev) | |||
20 | if (rev > 0x9) | 20 | if (rev > 0x9) |
21 | return; | 21 | return; |
22 | 22 | ||
23 | printk(KERN_INFO "Intel E7520/7320/7525 detected."); | ||
24 | |||
25 | /* enable access to config space*/ | 23 | /* enable access to config space*/ |
26 | pci_read_config_byte(dev, 0xf4, &config); | 24 | pci_read_config_byte(dev, 0xf4, &config); |
27 | pci_write_config_byte(dev, 0xf4, config|0x2); | 25 | pci_write_config_byte(dev, 0xf4, config|0x2); |
@@ -30,7 +28,8 @@ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev) | |||
30 | raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word); | 28 | raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word); |
31 | 29 | ||
32 | if (!(word & (1 << 13))) { | 30 | if (!(word & (1 << 13))) { |
33 | printk(KERN_INFO "Disabling irq balancing and affinity\n"); | 31 | printk(KERN_INFO "Intel E7520/7320/7525 detected. " |
32 | "Disabling irq balancing and affinity\n"); | ||
34 | #ifdef CONFIG_IRQBALANCE | 33 | #ifdef CONFIG_IRQBALANCE |
35 | irqbalance_disable(""); | 34 | irqbalance_disable(""); |
36 | #endif | 35 | #endif |