From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932253AbcGCWEa (ORCPT ); Sun, 3 Jul 2016 18:04:30 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:36621 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932160AbcGCWE3 (ORCPT ); Sun, 3 Jul 2016 18:04:29 -0400 From: Sergei Shtylyov To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] platform: don't return 0 from platform_get_irq[_byname]() on error Date: Mon, 04 Jul 2016 01:04:24 +0300 Message-ID: <5153966.D0zlDt82d1@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.10 (Linux/4.4.13-200.fc22.x86_64; KDE/4.14.17; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org of_irq_get[_byname]() return 0 iff irq_create_of_mapping() call fails. Returning both error code and 0 on failure is a sign of a misdesigned API, it makes the failure check unnecessarily complex and error prone. We should rely on the platform IRQ resource in this case, not return 0, especially as 0 can be a valid IRQ resource too... Fixes: aff008ad813c ("platform_get_irq: Revert to platform_get_resource if of_irq_get fails") Signed-off-by: Sergei Shtylyov CC: stable@vger.kernel.org --- The patch is against the 'driver-core-linus' branch of Greg KH's 'driver-core.git' repo. See also commit 3993546646ba ("of: irq: fix of_irq_get[_byname]() kernel-doc") Changes in version 2: - expanded the changelog. drivers/base/platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: driver-core/drivers/base/platform.c =================================================================== --- driver-core.orig/drivers/base/platform.c +++ driver-core/drivers/base/platform.c @@ -97,7 +97,7 @@ int platform_get_irq(struct platform_dev int ret; ret = of_irq_get(dev->dev.of_node, num); - if (ret >= 0 || ret == -EPROBE_DEFER) + if (ret > 0 || ret == -EPROBE_DEFER) return ret; } @@ -175,7 +175,7 @@ int platform_get_irq_byname(struct platf int ret; ret = of_irq_get_byname(dev->dev.of_node, name); - if (ret >= 0 || ret == -EPROBE_DEFER) + if (ret > 0 || ret == -EPROBE_DEFER) return ret; }