From patchwork Fri Mar 2 11:10:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 10254345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 24936603ED for ; Fri, 2 Mar 2018 11:12:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1880527E01 for ; Fri, 2 Mar 2018 11:12:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C3D828643; Fri, 2 Mar 2018 11:12:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_TVD_MIME_EPI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FBB127FA8 for ; Fri, 2 Mar 2018 11:12:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426942AbeCBLKq (ORCPT ); Fri, 2 Mar 2018 06:10:46 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:33471 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423538AbeCBLKm (ORCPT ); Fri, 2 Mar 2018 06:10:42 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 81167801F9; Fri, 2 Mar 2018 12:10:40 +0100 (CET) Date: Fri, 2 Mar 2018 12:10:40 +0100 From: Pavel Machek To: Linus Walleij Cc: Daniel Baluta , Thorsten Leemhuis , Peter Ujfalusi , Linux-ALSA , Ivajlo Dimitrov , Kevin Hilman , ext Tony Lindgren , Aaro Koskinen , kernel list , Sebastian Reichel , Martijn Braam , Filip =?utf-8?Q?Matijevi=C4=87?= , Mark Brown , =?utf-8?B?TWlja3Vsw6HFoQ==?= Qwertz , Sakari Ailus , Pali =?iso-8859-1?Q?Roh=E1r?= , clayton@craftyguy.net, Linux-OMAP , "Andrew F . Davis" , Patrik Bachan , linux-arm-kernel , serge@hallyn.com Subject: Re: [alsa-devel] regression v4.16 on Nokia N900: sound does not work Message-ID: <20180302111040.GA6344@amd> References: <20180224214617.GA22619@amd> <71aa88ec-d4df-b49c-7d73-27197f468491@leemhuis.info> <20180226131318.GA14045@amd> <20180226231336.GA18565@amd> <20180302091025.GC30267@amd> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi! > > If this is taking longer to fix, should c85823390215 be reverted in > > the meantime? It does not seem particulary important/urgent... > > No patience between the v4.16 release candidates eh ;) > > commit 6662ae6af82df10259a70c7569b4c12ea7f3ba93 > ("gpiolib: Keep returning EPROBE_DEFER when we should") > > and > > commit ce27fb2c56db6ccfe8099343bb4afdab15e77e7b > ("gpio: Handle deferred probing in of_find_gpio() properly") > > that are both in Torvalds' tree since yesterday should be fixing > this, I think? Did you try just using the upstream HEAD? Ok, so this code looks pretty crazy to me: I tried removing the "of_find_spi_gpio" part, and audio started working. What is going on with the ()s around == s? You made me look up C operator precedence. Hmm, and it is also wrong, right? It turns any error code into ENOENT, as it tries to do the "special handling". * * This means we don't need to look any further for * alternate name conventions, and we should really * preserve the return code for our user to be able to * retry probing later. */ if (IS_ERR(desc) && PTR_ERR(desc) == -EPROBE_DEFER) return desc; if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT)) break; } /* Special handling for SPI GPIOs if used */ if (IS_ERR(desc)) desc = of_find_spi_gpio(dev, con_id, &of_flags); /* Special handling for regulator GPIOs if used */ if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) desc = of_find_regulator_gpio(dev, con_id, &of_flags); Something like this? diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 84e5a9d..f0fab26 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -241,29 +241,17 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx, &of_flags); - /* - * -EPROBE_DEFER in our case means that we found a - * valid GPIO property, but no controller has been - * registered so far. - * - * This means we don't need to look any further for - * alternate name conventions, and we should really - * preserve the return code for our user to be able to - * retry probing later. - */ - if (IS_ERR(desc) && PTR_ERR(desc) == -EPROBE_DEFER) - return desc; - if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT)) + if (!IS_ERR(desc) || PTR_ERR(desc) != -ENOENT) break; } /* Special handling for SPI GPIOs if used */ - if (IS_ERR(desc)) + if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) desc = of_find_spi_gpio(dev, con_id, &of_flags); /* Special handling for regulator GPIOs if used */ - if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) + if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) desc = of_find_regulator_gpio(dev, con_id, &of_flags); if (IS_ERR(desc))