| Message ID | 20230826022922.3457054-3-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | iio: adc: at91_adc: Cleanup with the helpers | expand |
On Sat, 26 Aug 2023 10:29:21 +0800 Jinjie Ruan <ruanjinjie@huawei.com> wrote: > Use devm_request_irq() to request the interrupt, so we can > avoid having to manually clean this up. > > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> > --- > drivers/iio/adc/at91_adc.c | 28 +++++++++++++--------------- > 1 file changed, 13 insertions(+), 15 deletions(-) > > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c > index 318e33ce22fb..2ac1b64f0fb7 100644 > --- a/drivers/iio/adc/at91_adc.c > +++ b/drivers/iio/adc/at91_adc.c > @@ -1077,11 +1077,13 @@ static int at91_adc_probe(struct platform_device *pdev) > at91_adc_writel(st, AT91_ADC_IDR, 0xFFFFFFFF); > > if (st->caps->has_tsmr) > - ret = request_irq(st->irq, at91_adc_9x5_interrupt, 0, > - pdev->dev.driver->name, idev); > + ret = devm_request_irq(&pdev->dev, st->irq, > + at91_adc_9x5_interrupt, 0, > + pdev->dev.driver->name, idev); > else > - ret = request_irq(st->irq, at91_adc_rl_interrupt, 0, > - pdev->dev.driver->name, idev); > + ret = devm_request_irq(&pdev->dev, st->irq, > + at91_adc_rl_interrupt, 0, > + pdev->dev.driver->name, idev); > if (ret) { > dev_err(&pdev->dev, "Failed to allocate IRQ.\n"); > return ret; > @@ -1092,7 +1094,7 @@ static int at91_adc_probe(struct platform_device *pdev) > dev_err(&pdev->dev, > "Could not prepare or enable the clock.\n"); > ret = PTR_ERR(st->clk); > - goto error_free_irq; > + return ret; Whilst they go away in the next patch, this does look odd as you can clearly just do return PTR_ERR(st->clk); In the interests of easy step wise patch review, I'd prefer that you made that change in this patch in all the places this pattern occurs. > } > > st->adc_clk = devm_clk_get_enabled(&pdev->dev, "adc_op_clk"); > @@ -1100,7 +1102,7 @@ static int at91_adc_probe(struct platform_device *pdev) > dev_err(&pdev->dev, > "Could not prepare or enable the ADC clock.\n"); > ret = PTR_ERR(st->adc_clk); > - goto error_free_irq; > + return ret; > } > > /* > @@ -1119,8 +1121,7 @@ static int at91_adc_probe(struct platform_device *pdev) > > if (!st->startup_time) { > dev_err(&pdev->dev, "No startup time available.\n"); > - ret = -EINVAL; > - goto error_free_irq; > + return -EINVAL; > } > ticks = (*st->caps->calc_startup_ticks)(st->startup_time, adc_clk_khz); > > @@ -1148,7 +1149,7 @@ static int at91_adc_probe(struct platform_device *pdev) > ret = at91_adc_channel_init(idev); > if (ret < 0) { > dev_err(&pdev->dev, "Couldn't initialize the channels.\n"); > - goto error_free_irq; > + return ret; > } > > init_waitqueue_head(&st->wq_data_avail); > @@ -1163,19 +1164,19 @@ static int at91_adc_probe(struct platform_device *pdev) > ret = at91_adc_buffer_init(idev); > if (ret < 0) { > dev_err(&pdev->dev, "Couldn't initialize the buffer.\n"); > - goto error_free_irq; > + return ret; > } > > ret = at91_adc_trigger_init(idev); > if (ret < 0) { > dev_err(&pdev->dev, "Couldn't setup the triggers.\n"); > at91_adc_buffer_remove(idev); > - goto error_free_irq; > + return ret; > } > } else { > ret = at91_ts_register(idev, pdev); > if (ret) > - goto error_free_irq; > + return ret; > > at91_ts_hw_init(idev, adc_clk_khz); > } > @@ -1195,8 +1196,6 @@ static int at91_adc_probe(struct platform_device *pdev) > } else { > at91_ts_unregister(st); > } > -error_free_irq: > - free_irq(st->irq, idev); > return ret; > } > > @@ -1212,7 +1211,6 @@ static int at91_adc_remove(struct platform_device *pdev) > } else { > at91_ts_unregister(st); > } > - free_irq(st->irq, idev); > > return 0; > }
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index 318e33ce22fb..2ac1b64f0fb7 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -1077,11 +1077,13 @@ static int at91_adc_probe(struct platform_device *pdev) at91_adc_writel(st, AT91_ADC_IDR, 0xFFFFFFFF); if (st->caps->has_tsmr) - ret = request_irq(st->irq, at91_adc_9x5_interrupt, 0, - pdev->dev.driver->name, idev); + ret = devm_request_irq(&pdev->dev, st->irq, + at91_adc_9x5_interrupt, 0, + pdev->dev.driver->name, idev); else - ret = request_irq(st->irq, at91_adc_rl_interrupt, 0, - pdev->dev.driver->name, idev); + ret = devm_request_irq(&pdev->dev, st->irq, + at91_adc_rl_interrupt, 0, + pdev->dev.driver->name, idev); if (ret) { dev_err(&pdev->dev, "Failed to allocate IRQ.\n"); return ret; @@ -1092,7 +1094,7 @@ static int at91_adc_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Could not prepare or enable the clock.\n"); ret = PTR_ERR(st->clk); - goto error_free_irq; + return ret; } st->adc_clk = devm_clk_get_enabled(&pdev->dev, "adc_op_clk"); @@ -1100,7 +1102,7 @@ static int at91_adc_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Could not prepare or enable the ADC clock.\n"); ret = PTR_ERR(st->adc_clk); - goto error_free_irq; + return ret; } /* @@ -1119,8 +1121,7 @@ static int at91_adc_probe(struct platform_device *pdev) if (!st->startup_time) { dev_err(&pdev->dev, "No startup time available.\n"); - ret = -EINVAL; - goto error_free_irq; + return -EINVAL; } ticks = (*st->caps->calc_startup_ticks)(st->startup_time, adc_clk_khz); @@ -1148,7 +1149,7 @@ static int at91_adc_probe(struct platform_device *pdev) ret = at91_adc_channel_init(idev); if (ret < 0) { dev_err(&pdev->dev, "Couldn't initialize the channels.\n"); - goto error_free_irq; + return ret; } init_waitqueue_head(&st->wq_data_avail); @@ -1163,19 +1164,19 @@ static int at91_adc_probe(struct platform_device *pdev) ret = at91_adc_buffer_init(idev); if (ret < 0) { dev_err(&pdev->dev, "Couldn't initialize the buffer.\n"); - goto error_free_irq; + return ret; } ret = at91_adc_trigger_init(idev); if (ret < 0) { dev_err(&pdev->dev, "Couldn't setup the triggers.\n"); at91_adc_buffer_remove(idev); - goto error_free_irq; + return ret; } } else { ret = at91_ts_register(idev, pdev); if (ret) - goto error_free_irq; + return ret; at91_ts_hw_init(idev, adc_clk_khz); } @@ -1195,8 +1196,6 @@ static int at91_adc_probe(struct platform_device *pdev) } else { at91_ts_unregister(st); } -error_free_irq: - free_irq(st->irq, idev); return ret; } @@ -1212,7 +1211,6 @@ static int at91_adc_remove(struct platform_device *pdev) } else { at91_ts_unregister(st); } - free_irq(st->irq, idev); return 0; }
Use devm_request_irq() to request the interrupt, so we can avoid having to manually clean this up. Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- drivers/iio/adc/at91_adc.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)