OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iio: adc: xilinx: Remove platform_get_irq from xadc_remove function 

This patch avoids getting irq number in xadc_remove function. Instead
store 'irq' in xadc struct and use xadc->irq wherever needed.
This patch also resolves a warning reported by coverity where it asks to
check return value of platform_get_irq() for any errors in xadc_remove.

Signed-off-by: Manish Narani <manish.narani@xilinx.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Manish Narani 2018-07-23 20:32:02 +05:30 committed by Jonathan Cameron
parent 81f5471838
commit 50e8e9f309
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/iio/adc/xilinx-xadc-core.c
View File

@ -1175,6 +1175,7 @@ static int xadc_probe(struct platform_device *pdev)
xadc = iio_priv(indio_dev); xadc = iio_priv(indio_dev);
xadc->ops = id->data; xadc->ops = id->data;
xadc->irq = irq;
init_completion(&xadc->completion); init_completion(&xadc->completion);
mutex_init(&xadc->mutex); mutex_init(&xadc->mutex);
spin_lock_init(&xadc->lock); spin_lock_init(&xadc->lock);
@ -1225,11 +1226,11 @@ static int xadc_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_free_samplerate_trigger; goto err_free_samplerate_trigger;
ret = xadc->ops->setup(pdev, indio_dev, irq); ret = xadc->ops->setup(pdev, indio_dev, xadc->irq);
if (ret) if (ret)
goto err_clk_disable_unprepare; goto err_clk_disable_unprepare;
ret = request_irq(irq, xadc->ops->interrupt_handler, 0, ret = request_irq(xadc->irq, xadc->ops->interrupt_handler, 0,
dev_name(&pdev->dev), indio_dev); dev_name(&pdev->dev), indio_dev);
if (ret) if (ret)
goto err_clk_disable_unprepare; goto err_clk_disable_unprepare;
@ -1288,7 +1289,7 @@ static int xadc_probe(struct platform_device *pdev)
return 0; return 0;
err_free_irq: err_free_irq:
free_irq(irq, indio_dev); free_irq(xadc->irq, indio_dev);
err_clk_disable_unprepare: err_clk_disable_unprepare:
clk_disable_unprepare(xadc->clk); clk_disable_unprepare(xadc->clk);
err_free_samplerate_trigger: err_free_samplerate_trigger:
@ -1310,7 +1311,6 @@ static int xadc_remove(struct platform_device *pdev)
{ {
struct iio_dev *indio_dev = platform_get_drvdata(pdev); struct iio_dev *indio_dev = platform_get_drvdata(pdev);
struct xadc *xadc = iio_priv(indio_dev); struct xadc *xadc = iio_priv(indio_dev);
int irq = platform_get_irq(pdev, 0);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
if (xadc->ops->flags & XADC_FLAGS_BUFFERED) { if (xadc->ops->flags & XADC_FLAGS_BUFFERED) {
@ -1318,7 +1318,7 @@ static int xadc_remove(struct platform_device *pdev)
iio_trigger_free(xadc->convst_trigger); iio_trigger_free(xadc->convst_trigger);
iio_triggered_buffer_cleanup(indio_dev); iio_triggered_buffer_cleanup(indio_dev);
} }
free_irq(irq, indio_dev); free_irq(xadc->irq, indio_dev);
clk_disable_unprepare(xadc->clk); clk_disable_unprepare(xadc->clk);
cancel_delayed_work(&xadc->zynq_unmask_work); cancel_delayed_work(&xadc->zynq_unmask_work);
kfree(xadc->data); kfree(xadc->data);

1
drivers/iio/adc/xilinx-xadc.h
View File

@ -68,6 +68,7 @@ struct xadc {
spinlock_t lock; spinlock_t lock;
struct completion completion; struct completion completion;
int irq;
}; };
struct xadc_ops { struct xadc_ops {