From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161072AbcIGLXA (ORCPT ); Wed, 7 Sep 2016 07:23:00 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35718 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030219AbcIGLW6 (ORCPT ); Wed, 7 Sep 2016 07:22:58 -0400 Date: Wed, 7 Sep 2016 12:24:43 +0100 From: Lee Jones To: Arnd Bergmann Cc: Russell King , Linus Walleij , Thomas Gleixner , Russell King , linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/4] mfd: ucb1x00: remove NO_IRQ check Message-ID: <20160907112443.GY4921@dell> References: <20160906135637.2622666-1-arnd@arndb.de> <20160906135637.2622666-3-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160906135637.2622666-3-arnd@arndb.de> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 06 Sep 2016, Arnd Bergmann wrote: > probe_irq_off() returns '0' on failure, not NO_IRQ, so the check > in this driver is clearly wrong. This replaces it with the > regular '!irq' check used in other drivers. > > The sa1100 platform that this driver is used on originally numbered > all its interrupts starting at '0', which would have conflicted with > this change, but as of commit 18f3aec ("ARM: 8230/1: sa1100: shift > IRQs by one"), this is not a problem any more. > > Signed-off-by: Arnd Bergmann > --- > drivers/mfd/ucb1x00-core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied, thanks. I'm going to leave this in MFD 'as is' at them moment. This will break bisectability of course, but it's better we get this in -next now in order to match it up with the other half of the fix. The plan is probably to squash the two patches together, keeping Russell's authorship (first come, first served) and give creds to Arnd for this part of the patch. Unless anyone has any complaints, I also plan to keep both of your SoBs. > diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c > index 48bea5038654..d6fb2e1a759a 100644 > --- a/drivers/mfd/ucb1x00-core.c > +++ b/drivers/mfd/ucb1x00-core.c > @@ -537,7 +537,7 @@ static int ucb1x00_probe(struct mcp *mcp) > ucb1x00_enable(ucb); > ucb->irq = ucb1x00_detect_irq(ucb); > ucb1x00_disable(ucb); > - if (ucb->irq == NO_IRQ) { > + if (!ucb->irq) { > dev_err(&ucb->dev, "IRQ probe failed\n"); > ret = -ENODEV; > goto err_no_irq; -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog