From: Daniel J Blueman <daniel@numascale-asia.com>
To: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
Daniel J Blueman <daniel@numascale-asia.com>
Subject: [PATCH RESEND] Fix printing when no interrupt is allocated
Date: Wed, 21 Nov 2012 16:43:21 +0800 [thread overview]
Message-ID: <1353487401-10279-1-git-send-email-daniel@numascale-asia.com> (raw)
Previously a new line is implicitly added in the no GSI case:
[ 7.185182] pci 0001:00:12.0: can't derive routing for PCI INT A
[ 7.191352] pci 0001:00:12.0: PCI INT A: no GSI
[ 7.195956] - using ISA IRQ 10
The code thus prints a blank line where no legacy IRQ is available:
[ 1.650124] pci 0000:00:14.0: can't derive routing for PCI INT A
[ 1.650126] pci 0000:00:14.0: PCI INT A: no GSI
[ 1.650126]
[ 1.650180] pci 0000:00:14.0: can't derive routing for PCI INT A
Fix this by making the newline explicit and removing the superfluous
one.
Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com>
---
drivers/acpi/pci_irq.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 0eefa12..2c37996 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -459,7 +459,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
*/
if (gsi < 0) {
u32 dev_gsi;
- dev_warn(&dev->dev, "PCI INT %c: no GSI", pin_name(pin));
+ dev_warn(&dev->dev, "PCI INT %c: no GSI\n", pin_name(pin));
/* Interrupt Line values above 0xF are forbidden */
if (dev->irq > 0 && (dev->irq <= 0xF) &&
(acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {
@@ -467,11 +467,9 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
acpi_register_gsi(&dev->dev, dev_gsi,
ACPI_LEVEL_SENSITIVE,
ACPI_ACTIVE_LOW);
- return 0;
- } else {
- printk("\n");
- return 0;
}
+
+ return 0;
}
rc = acpi_register_gsi(&dev->dev, gsi, triggering, polarity);
--
1.7.9.5
next reply other threads:[~2012-11-21 8:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-21 8:43 Daniel J Blueman [this message]
2012-11-21 13:46 ` [PATCH RESEND] acpi: Fix logging when no pci_irq is allocated Joe Perches
2012-11-21 20:50 ` Rafael J. Wysocki
2012-11-21 20:53 ` Joe Perches
2012-11-21 21:25 ` Rafael J. Wysocki
2012-11-21 21:24 ` Joe Perches
2012-11-22 0:14 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353487401-10279-1-git-send-email-daniel@numascale-asia.com \
--to=daniel@numascale-asia.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).