From patchwork Wed Nov 21 08:43:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel J Blueman X-Patchwork-Id: 1778921 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1465EDF288 for ; Wed, 21 Nov 2012 08:43:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754051Ab2KUInf (ORCPT ); Wed, 21 Nov 2012 03:43:35 -0500 Received: from mail-da0-f46.google.com ([209.85.210.46]:41352 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754047Ab2KUIne (ORCPT ); Wed, 21 Nov 2012 03:43:34 -0500 Received: by mail-da0-f46.google.com with SMTP id p5so1631063dak.19 for ; Wed, 21 Nov 2012 00:43:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=XHRLZLHMdIi2K5riyxoACbIWDg4y3H2TW8PQE3GbEow=; b=C40CZmhTpauiS3gS/2QxYZ8Mxhrhdr1Kx6jAVpSyd1xE8P8N2KxyR6cnss76kPvyH3 yP3H95k244PTWnz0ZAg9eGW2ACl+SouIwoapvjp6WUqY3WhbN/I4RME97Jm0MGMbEx8U ZKZ/2ES3rmVat/0wwvUnypACctjvcvirn0ZqWiF6IoSr+8kBWeuNjTrKn0xUnKptStCY JDwZFHB5fzZTat2GhgypWiUam3TYCBJwW0CjUrmJR1lFMCpVhEeTf3s96TRFSxBE3mF7 kMeaWrMn6ga+OARCSMAHU6hHIc5+GjiIw+OVI5N768HDnPvHwv7x4Q6Ba9Dvr9/bMXli bzDQ== Received: by 10.68.189.70 with SMTP id gg6mr56996425pbc.97.1353487414046; Wed, 21 Nov 2012 00:43:34 -0800 (PST) Received: from meiko.1dn ([115.42.131.38]) by mx.google.com with ESMTPS id n7sm9607714pav.26.2012.11.21.00.43.31 (version=SSLv3 cipher=OTHER); Wed, 21 Nov 2012 00:43:33 -0800 (PST) From: Daniel J Blueman To: Len Brown Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel J Blueman Subject: [PATCH RESEND] Fix printing when no interrupt is allocated Date: Wed, 21 Nov 2012 16:43:21 +0800 Message-Id: <1353487401-10279-1-git-send-email-daniel@numascale-asia.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQlevbnvIdJQYaAacVFvMQqH0fWcrid1EXIASEnSZdHWnPGgL3McENnzJ8GB+PDTq1xDlQxB Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 --- 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);