From: "Andrew F. Davis" <afd@ti.com>
To: Pavel Machek <pavel@ucw.cz>, Linus Walleij <linus.walleij@linaro.org>
Cc: "Daniel Baluta" <daniel.baluta@gmail.com>,
"Thorsten Leemhuis" <regressions@leemhuis.info>,
"Peter Ujfalusi" <peter.ujfalusi@ti.com>,
Linux-ALSA <alsa-devel@alsa-project.org>,
"Ivajlo Dimitrov" <ivo.g.dimitrov.75@gmail.com>,
"Kevin Hilman" <khilman@kernel.org>,
"ext Tony Lindgren" <tony@atomide.com>,
"Aaro Koskinen" <aaro.koskinen@iki.fi>,
"kernel list" <linux-kernel@vger.kernel.org>,
"Sebastian Reichel" <sre@kernel.org>,
"Martijn Braam" <martijn@brixit.nl>,
"Filip Matijević" <filip.matijevic.pz@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Mickuláš Qwertz" <abcloriens@gmail.com>,
"Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Pali Rohár" <pali.rohar@gmail.com>,
clayton@craftyguy.net, Linux-OMAP <linux-omap@vger.kernel.org>,
"Patrik Bachan" <patrikbachan@gmail.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
serge@hallyn.com
Subject: Re: [alsa-devel] regression v4.16 on Nokia N900: sound does not work
Date: Fri, 2 Mar 2018 08:22:52 -0600 [thread overview]
Message-ID: <0f090cc7-2b72-a038-26ee-d43077cb9663@ti.com> (raw)
In-Reply-To: <20180302111040.GA6344@amd>
On 03/02/2018 05:10 AM, Pavel Machek wrote:
> 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)
I rather like the () so one doesn't always have to look up C operator
precedence to verify..
> 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))
>
next prev parent reply other threads:[~2018-03-02 14:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-24 21:46 regression v4.16 on Nokia N900:/dev/input/event6 aka AV Jack support disappeared Pavel Machek
2018-02-26 9:47 ` Thorsten Leemhuis
2018-02-26 13:13 ` regression v4.16 on Nokia N900: sound does not work Pavel Machek
2018-02-26 14:02 ` [alsa-devel] " Daniel Baluta
2018-02-26 23:13 ` Pavel Machek
2018-02-26 23:30 ` Pavel Machek
2018-02-27 8:43 ` Linus Walleij
2018-03-02 9:10 ` Pavel Machek
2018-03-02 9:33 ` Linus Walleij
2018-03-02 10:31 ` Pavel Machek
2018-03-02 12:07 ` Linus Walleij
2018-03-02 12:14 ` Pavel Machek
2018-03-02 12:33 ` Linus Walleij
2018-03-02 11:10 ` Pavel Machek
2018-03-02 11:21 ` Pavel Machek
2018-03-02 14:22 ` Andrew F. Davis [this message]
2018-03-02 16:53 ` Pavel Machek
2018-03-02 17:08 ` Russell King - ARM Linux
2018-03-02 17:18 ` Andrew F. Davis
2018-02-26 15:43 ` regression v4.16 on Nokia N900:/dev/input/event6 aka AV Jack support disappeared Andrew F. Davis
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=0f090cc7-2b72-a038-26ee-d43077cb9663@ti.com \
--to=afd@ti.com \
--cc=aaro.koskinen@iki.fi \
--cc=abcloriens@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=clayton@craftyguy.net \
--cc=daniel.baluta@gmail.com \
--cc=filip.matijevic.pz@gmail.com \
--cc=ivo.g.dimitrov.75@gmail.com \
--cc=khilman@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=martijn@brixit.nl \
--cc=pali.rohar@gmail.com \
--cc=patrikbachan@gmail.com \
--cc=pavel@ucw.cz \
--cc=peter.ujfalusi@ti.com \
--cc=regressions@leemhuis.info \
--cc=sakari.ailus@linux.intel.com \
--cc=serge@hallyn.com \
--cc=sre@kernel.org \
--cc=tony@atomide.com \
/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;
as well as URLs for NNTP newsgroup(s).