| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <6dc9dbc0-c338-eb21-aeb3-70026bebfd41@electromag.com.au>
Date: Thu, 1 Aug 2019 10:37:40 +0800
From: Phil Reid <preid@...ctromag.com.au>
To: Stephen Boyd <swboyd@...omium.org>, linux-kernel@...r.kernel.org
Cc: Jonathan Cameron <jic23@...nel.org>,
Hartmut Knaack <knaack.h@....de>,
Lars-Peter Clausen <lars@...afoo.de>,
Peter Meerwald-Stadler <pmeerw@...erw.net>,
linux-iio@...r.kernel.org,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Subject: Re: [PATCH v6 19/57] iio: Remove dev_err() usage after
platform_get_irq()
G'day Stephen,
One comment below.
On 31/07/2019 22:32, Stephen Boyd wrote:
> Quoting Phil Reid (2019-07-30 23:42:16)
>> G'day Stephen,
>>
>> A comment unrelated to your change.
>>
>> On 31/07/2019 02:15, Stephen Boyd wrote:
>> ....
>>
>>> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
>>> index 32f1c4a33b20..abe99856c823 100644
>>> --- a/drivers/iio/adc/at91_adc.c
>>> +++ b/drivers/iio/adc/at91_adc.c
>>> @@ -1179,10 +1179,8 @@ static int at91_adc_probe(struct platform_device *pdev)
>>> idev->info = &at91_adc_info;
>>>
>>> st->irq = platform_get_irq(pdev, 0);
>>> - if (st->irq < 0) {
>>> - dev_err(&pdev->dev, "No IRQ ID is designated\n");
>>> + if (st->irq < 0)
>>> return -ENODEV;
>> Should this be returning st->irq instead of -ENODEV?
>> eg: platform_get_irq can return -EPROBE_DEFER
>>
>> Pattern is repeated in a number of other places.
>
> Probably? Here's a patch.
>
> ----8<----
> From: Stephen Boyd <swboyd@...omium.org>
> Subject: [PATCH] iio: Return error values from platform_get_irq*()
>
> Sometimes platform_get_irq*() can return -EPROBE_DEFER, so it's best to
> return the actual error value from calling this function instead of
> overriding the value to something like -EINVAL or -ENXIO. Except for in
> the case when the irq value is 0 and the driver knows that irq 0 isn't
> valid. In such a situation, return whatever error value was returned
> before this change.
>
> Reported-by: Phil Reid <preid@...ctromag.com.au>
> Cc: Phil Reid <preid@...ctromag.com.au>
> Cc: Jonathan Cameron <jic23@...nel.org>
> Cc: Hartmut Knaack <knaack.h@....de>
> Cc: Lars-Peter Clausen <lars@...afoo.de>
> Cc: Peter Meerwald-Stadler <pmeerw@...erw.net>
> Cc: linux-iio@...r.kernel.org
> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> Signed-off-by: Stephen Boyd <swboyd@...omium.org>
> ---
> drivers/iio/adc/at91_adc.c | 2 +-
> drivers/iio/adc/bcm_iproc_adc.c | 2 +-
> drivers/iio/adc/fsl-imx25-gcq.c | 4 +---
> drivers/iio/adc/lpc32xx_adc.c | 2 +-
> drivers/iio/adc/npcm_adc.c | 2 +-
> drivers/iio/adc/spear_adc.c | 2 +-
> 6 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> index abe99856c823..2c604198c4b7 100644
> --- a/drivers/iio/adc/at91_adc.c
> +++ b/drivers/iio/adc/at91_adc.c
> @@ -1180,7 +1180,7 @@ static int at91_adc_probe(struct platform_device *pdev)
>
> st->irq = platform_get_irq(pdev, 0);
> if (st->irq < 0)
> - return -ENODEV;
> + return st->irq;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>
> diff --git a/drivers/iio/adc/bcm_iproc_adc.c b/drivers/iio/adc/bcm_iproc_adc.c
> index 646ebdc0a8b4..6c05ea510c40 100644
> --- a/drivers/iio/adc/bcm_iproc_adc.c
> +++ b/drivers/iio/adc/bcm_iproc_adc.c
> @@ -541,7 +541,7 @@ static int iproc_adc_probe(struct platform_device *pdev)
>
> adc_priv->irqno = platform_get_irq(pdev, 0);
> if (adc_priv->irqno <= 0)
> - return -ENODEV;
> + return adc_priv->irqno;
return adc_priv->irqno ? : -ENODEV;
>
> ret = regmap_update_bits(adc_priv->regmap, IPROC_REGCTL2,
> IPROC_ADC_AUXIN_SCAN_ENA, 0);
> diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c
> index fa71489195c6..ee20ab09abe5 100644
> --- a/drivers/iio/adc/fsl-imx25-gcq.c
> +++ b/drivers/iio/adc/fsl-imx25-gcq.c
> @@ -340,9 +340,7 @@ static int mx25_gcq_probe(struct platform_device *pdev)
>
> priv->irq = platform_get_irq(pdev, 0);
> if (priv->irq <= 0) {
> - ret = priv->irq;
> - if (!ret)
> - ret = -ENXIO;
> + ret = priv->irq ? : -ENXIO;
> goto err_clk_unprepare;
> }
>
> diff --git a/drivers/iio/adc/lpc32xx_adc.c b/drivers/iio/adc/lpc32xx_adc.c
> index b896f7ff4572..edbb58212fba 100644
> --- a/drivers/iio/adc/lpc32xx_adc.c
> +++ b/drivers/iio/adc/lpc32xx_adc.c
> @@ -173,7 +173,7 @@ static int lpc32xx_adc_probe(struct platform_device *pdev)
>
> irq = platform_get_irq(pdev, 0);
> if (irq <= 0)
> - return -ENXIO;
> + return irq ? : -ENXIO;
>
> retval = devm_request_irq(&pdev->dev, irq, lpc32xx_adc_isr, 0,
> LPC32XXAD_NAME, st);
> diff --git a/drivers/iio/adc/npcm_adc.c b/drivers/iio/adc/npcm_adc.c
> index 910f3585fa54..1e54a64a4534 100644
> --- a/drivers/iio/adc/npcm_adc.c
> +++ b/drivers/iio/adc/npcm_adc.c
> @@ -225,7 +225,7 @@ static int npcm_adc_probe(struct platform_device *pdev)
>
> irq = platform_get_irq(pdev, 0);
> if (irq <= 0) {
> - ret = -EINVAL;
> + ret = irq ? : -EINVAL;
> goto err_disable_clk;
> }
>
> diff --git a/drivers/iio/adc/spear_adc.c b/drivers/iio/adc/spear_adc.c
> index 592b97c464da..9b16717ac7e7 100644
> --- a/drivers/iio/adc/spear_adc.c
> +++ b/drivers/iio/adc/spear_adc.c
> @@ -301,7 +301,7 @@ static int spear_adc_probe(struct platform_device *pdev)
>
> irq = platform_get_irq(pdev, 0);
> if (irq <= 0) {
> - ret = -EINVAL;
> + ret = irq ? : -EINVAL;
> goto errout2;
> }
>
>
--
Regards
Phil Reid
Powered by blists - more mailing lists