mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Andy Shevchenko <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, linux-kernel@vger.kernel.org,
	andriy.shevchenko@linux.intel.com, tglx@linutronix.de,
	hpa@zytor.com, bhelgaas@google.com
Subject: [tip:x86/platform] x86/pci/intel_mid_pci: Propagate actual return code
Date: Wed, 29 Jul 2015 12:36:56 -0700	[thread overview]
Message-ID: <tip-2a61c8eaf1879db99286c3f5fe5e78086c7edb85@git.kernel.org> (raw)
In-Reply-To: <1438161409-4671-3-git-send-email-andriy.shevchenko@linux.intel.com>

Commit-ID:  2a61c8eaf1879db99286c3f5fe5e78086c7edb85
Gitweb:     http://git.kernel.org/tip/2a61c8eaf1879db99286c3f5fe5e78086c7edb85
Author:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
AuthorDate: Wed, 29 Jul 2015 12:16:48 +0300
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 29 Jul 2015 21:23:50 +0200

x86/pci/intel_mid_pci: Propagate actual return code

mp_map_gsi_to_irq() returns different codes if it fails.
intel_mid_pci_irq_enable() hides this under -EBUSY.

Return the actual failure code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/1438161409-4671-3-git-send-email-andriy.shevchenko@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/pci/intel_mid_pci.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
index 7553921..3361f0a 100644
--- a/arch/x86/pci/intel_mid_pci.c
+++ b/arch/x86/pci/intel_mid_pci.c
@@ -213,6 +213,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
 {
 	struct irq_alloc_info info;
 	int polarity;
+	int ret;
 
 	if (dev->irq_managed && dev->irq > 0)
 		return 0;
@@ -244,8 +245,9 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
 	 * MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to
 	 * IOAPIC RTE entries, so we just enable RTE for the device.
 	 */
-	if (mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC, &info) < 0)
-		return -EBUSY;
+	ret = mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC, &info);
+	if (ret < 0)
+		return ret;
 
 	dev->irq_managed = 1;
 

  reply	other threads:[~2015-07-29 19:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-29  9:16 [PATCH v3 0/3] x86/pci/intel-mid-pci: fix to get eMMC detected Andy Shevchenko
2015-07-29  9:16 ` [PATCH v3 1/3] x86/pci/intel_mid_pci: work around for IRQ0 assignment Andy Shevchenko
2015-07-29 19:36   ` [tip:x86/platform] x86/pci/intel_mid_pci: Work " tip-bot for Andy Shevchenko
2015-07-29  9:16 ` [PATCH v3 2/3] x86/pci/intel_mid_pci: propagate actual return code Andy Shevchenko
2015-07-29 19:36   ` tip-bot for Andy Shevchenko [this message]
2015-07-29  9:16 ` [PATCH v3 3/3] x86/pci/intel_mid_pci: fix a sparse warning Andy Shevchenko
2015-07-29 19:37   ` [tip:x86/platform] x86/pci/intel_mid_pci: Make intel_mid_pci_ops static tip-bot for Andy Shevchenko
2015-07-29 19:33 ` [PATCH v3 0/3] x86/pci/intel-mid-pci: fix to get eMMC detected Thomas Gleixner

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=tip-2a61c8eaf1879db99286c3f5fe5e78086c7edb85@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=bhelgaas@google.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /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

Powered by JetHome