Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1678497

Re: [PATCH] clocksource: em_sti: fix error return codes in em_sti_probe()

Show all headers | View raw

Hi Frans,

Quoting Frans Klaver <fransklaver@gmail.com>:

> On Fri, Jun 30, 2017 at 6:42 AM, Gustavo A. R. Silva
> <garsilva@embeddedor.com> wrote:
>> Propagate the return values of platform_get_irq and
>> devm_request_irq on failure.
>>
>> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
>> ---
>>  drivers/clocksource/em_sti.c | 9 +++++----
>>  1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
>> index bc48cbf..c4818dd 100644
>> --- a/drivers/clocksource/em_sti.c
>> +++ b/drivers/clocksource/em_sti.c
>> @@ -305,7 +305,7 @@ static int em_sti_probe(struct platform_device *pdev)
>>         irq = platform_get_irq(pdev, 0);
>>         if (irq < 0) {
>>                 dev_err(&pdev->dev, "failed to get irq\n");
>> -               return -EINVAL;
>> +               return irq;
>>         }
>>
>>         /* map memory, let base point to the STI instance */
>> @@ -314,11 +314,12 @@ static int em_sti_probe(struct platform_device *pdev)
>>         if (IS_ERR(p->base))
>>                 return PTR_ERR(p->base);
>>
>> -       if (devm_request_irq(&pdev->dev, irq, em_sti_interrupt,
>> +       irq = devm_request_irq(&pdev->dev, irq, em_sti_interrupt,
>>                              IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,
>> -                            dev_name(&pdev->dev), p)) {
>> +                            dev_name(&pdev->dev), p);
>> +       if (irq) {
>>                 dev_err(&pdev->dev, "failed to request low IRQ\n");
>> -               return -ENOENT;
>> +               return irq;
>>         }
>
> This works. Yet I think that 'ret' would be a better candidate for
> taking the result of devm_request_irq, since it doesn't return the irq
> number on success. Should someone decide to reference irq at a later
> point in the code, this has to be changed.

Good point. I'll change it and send a new patch shortly.

Thanks!
--
Gustavo A. R. Silva

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] clocksource: em_sti: fix error return codes in em_sti_probe() "Gustavo A. R. Silva" <garsilva@embeddedor.com> - 2017-06-30 06:50 +0200
  Re: [PATCH] clocksource: em_sti: fix error return codes in em_sti_probe() Frans Klaver <fransklaver@gmail.com> - 2017-06-30 07:50 +0200
    Re: [PATCH] clocksource: em_sti: fix error return codes in  em_sti_probe() "Gustavo A. R. Silva" <garsilva@embeddedor.com> - 2017-06-30 08:00 +0200
      [PATCH v2] clocksource: em_sti: fix error return codes in  em_sti_probe() "Gustavo A. R. Silva" <garsilva@embeddedor.com> - 2017-06-30 09:10 +0200

csiph-web