From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751658AbdATJLY (ORCPT ); Fri, 20 Jan 2017 04:11:24 -0500 Received: from terminus.zytor.com ([65.50.211.136]:46246 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403AbdATJLX (ORCPT ); Fri, 20 Jan 2017 04:11:23 -0500 Date: Fri, 20 Jan 2017 01:11:15 -0800 From: tip-bot for Andy Shevchenko Message-ID: Cc: linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <20170119192425.189899-4-andriy.shevchenko@linux.intel.com> References: <20170119192425.189899-4-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/intel-mid: Don't shadow error code of mp_map_gsi_to_irq() Git-Commit-ID: 939533955d1f1d51e8e37d7d675646ce9d55534b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 939533955d1f1d51e8e37d7d675646ce9d55534b Gitweb: http://git.kernel.org/tip/939533955d1f1d51e8e37d7d675646ce9d55534b Author: Andy Shevchenko AuthorDate: Thu, 19 Jan 2017 21:24:24 +0200 Committer: Thomas Gleixner CommitDate: Fri, 20 Jan 2017 10:07:41 +0100 x86/platform/intel-mid: Don't shadow error code of mp_map_gsi_to_irq() When call mp_map_gsi_to_irq() and return its error code do not shadow it. Note that 0 is not an error. Signed-off-by: Andy Shevchenko Link: http://lkml.kernel.org/r/20170119192425.189899-4-andriy.shevchenko@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c index 3f1f1c7..8a10a56 100644 --- a/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c +++ b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c @@ -28,9 +28,9 @@ static struct platform_device wdt_dev = { static int tangier_probe(struct platform_device *pdev) { - int gsi; struct irq_alloc_info info; struct intel_mid_wdt_pdata *pdata = pdev->dev.platform_data; + int gsi, irq; if (!pdata) return -EINVAL; @@ -38,10 +38,10 @@ static int tangier_probe(struct platform_device *pdev) /* IOAPIC builds identity mapping between GSI and IRQ on MID */ gsi = pdata->irq; ioapic_set_alloc_attr(&info, cpu_to_node(0), 1, 0); - if (mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC, &info) <= 0) { - dev_warn(&pdev->dev, "cannot find interrupt %d in ioapic\n", - gsi); - return -EINVAL; + irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC, &info); + if (irq < 0) { + dev_warn(&pdev->dev, "cannot find interrupt %d in ioapic\n", gsi); + return irq; } return 0;