From: Jonathan Cameron <jic23@kernel.org>
To: Manish Narani <manish.narani@xilinx.com>
Cc: <lakshmi.sai.krishna.potthuri@xilinx.com>,
<michal.simek@xilinx.com>, <pmeerw@pmeerw.net>, <lars@metafoo.de>,
<knaack.h@gmx.de>, <anirudh@xilinx.com>, <sgoud@xilinx.com>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-iio@vger.kernel.org>
Subject: Re: [PATCH v2 3/4] iio: adc: xilinx: Remove platform_get_irq from xadc_remove function
Date: Sun, 29 Jul 2018 13:29:35 +0100 [thread overview]
Message-ID: <20180729132935.28996ab6@archlinux> (raw)
In-Reply-To: <1532358123-23485-4-git-send-email-manish.narani@xilinx.com>
On Mon, 23 Jul 2018 20:32:02 +0530
Manish Narani <manish.narani@xilinx.com> wrote:
> 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>
Applied.
Thanks,
Jonathan
> ---
> drivers/iio/adc/xilinx-xadc-core.c | 10 +++++-----
> drivers/iio/adc/xilinx-xadc.h | 1 +
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
> index 0dd306d..44a2519 100644
> --- a/drivers/iio/adc/xilinx-xadc-core.c
> +++ b/drivers/iio/adc/xilinx-xadc-core.c
> @@ -1175,6 +1175,7 @@ static int xadc_probe(struct platform_device *pdev)
>
> xadc = iio_priv(indio_dev);
> xadc->ops = id->data;
> + xadc->irq = irq;
> init_completion(&xadc->completion);
> mutex_init(&xadc->mutex);
> spin_lock_init(&xadc->lock);
> @@ -1225,11 +1226,11 @@ static int xadc_probe(struct platform_device *pdev)
> if (ret)
> goto err_free_samplerate_trigger;
>
> - ret = xadc->ops->setup(pdev, indio_dev, irq);
> + ret = xadc->ops->setup(pdev, indio_dev, xadc->irq);
> if (ret)
> 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);
> if (ret)
> goto err_clk_disable_unprepare;
> @@ -1288,7 +1289,7 @@ static int xadc_probe(struct platform_device *pdev)
> return 0;
>
> err_free_irq:
> - free_irq(irq, indio_dev);
> + free_irq(xadc->irq, indio_dev);
> err_clk_disable_unprepare:
> clk_disable_unprepare(xadc->clk);
> 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 xadc *xadc = iio_priv(indio_dev);
> - int irq = platform_get_irq(pdev, 0);
>
> iio_device_unregister(indio_dev);
> 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_triggered_buffer_cleanup(indio_dev);
> }
> - free_irq(irq, indio_dev);
> + free_irq(xadc->irq, indio_dev);
> clk_disable_unprepare(xadc->clk);
> cancel_delayed_work(&xadc->zynq_unmask_work);
> kfree(xadc->data);
> diff --git a/drivers/iio/adc/xilinx-xadc.h b/drivers/iio/adc/xilinx-xadc.h
> index 62edbda..8c00095 100644
> --- a/drivers/iio/adc/xilinx-xadc.h
> +++ b/drivers/iio/adc/xilinx-xadc.h
> @@ -68,6 +68,7 @@ struct xadc {
> spinlock_t lock;
>
> struct completion completion;
> + int irq;
> };
>
> struct xadc_ops {
WARNING: multiple messages have this Message-ID (diff)
From: jic23@kernel.org (Jonathan Cameron)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/4] iio: adc: xilinx: Remove platform_get_irq from xadc_remove function
Date: Sun, 29 Jul 2018 13:29:35 +0100 [thread overview]
Message-ID: <20180729132935.28996ab6@archlinux> (raw)
In-Reply-To: <1532358123-23485-4-git-send-email-manish.narani@xilinx.com>
On Mon, 23 Jul 2018 20:32:02 +0530
Manish Narani <manish.narani@xilinx.com> wrote:
> 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>
Applied.
Thanks,
Jonathan
> ---
> drivers/iio/adc/xilinx-xadc-core.c | 10 +++++-----
> drivers/iio/adc/xilinx-xadc.h | 1 +
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
> index 0dd306d..44a2519 100644
> --- a/drivers/iio/adc/xilinx-xadc-core.c
> +++ b/drivers/iio/adc/xilinx-xadc-core.c
> @@ -1175,6 +1175,7 @@ static int xadc_probe(struct platform_device *pdev)
>
> xadc = iio_priv(indio_dev);
> xadc->ops = id->data;
> + xadc->irq = irq;
> init_completion(&xadc->completion);
> mutex_init(&xadc->mutex);
> spin_lock_init(&xadc->lock);
> @@ -1225,11 +1226,11 @@ static int xadc_probe(struct platform_device *pdev)
> if (ret)
> goto err_free_samplerate_trigger;
>
> - ret = xadc->ops->setup(pdev, indio_dev, irq);
> + ret = xadc->ops->setup(pdev, indio_dev, xadc->irq);
> if (ret)
> 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);
> if (ret)
> goto err_clk_disable_unprepare;
> @@ -1288,7 +1289,7 @@ static int xadc_probe(struct platform_device *pdev)
> return 0;
>
> err_free_irq:
> - free_irq(irq, indio_dev);
> + free_irq(xadc->irq, indio_dev);
> err_clk_disable_unprepare:
> clk_disable_unprepare(xadc->clk);
> 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 xadc *xadc = iio_priv(indio_dev);
> - int irq = platform_get_irq(pdev, 0);
>
> iio_device_unregister(indio_dev);
> 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_triggered_buffer_cleanup(indio_dev);
> }
> - free_irq(irq, indio_dev);
> + free_irq(xadc->irq, indio_dev);
> clk_disable_unprepare(xadc->clk);
> cancel_delayed_work(&xadc->zynq_unmask_work);
> kfree(xadc->data);
> diff --git a/drivers/iio/adc/xilinx-xadc.h b/drivers/iio/adc/xilinx-xadc.h
> index 62edbda..8c00095 100644
> --- a/drivers/iio/adc/xilinx-xadc.h
> +++ b/drivers/iio/adc/xilinx-xadc.h
> @@ -68,6 +68,7 @@ struct xadc {
> spinlock_t lock;
>
> struct completion completion;
> + int irq;
> };
>
> struct xadc_ops {
next prev parent reply other threads:[~2018-07-29 13:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-23 15:01 [PATCH v2 0/4] iio: adc: xilinx: XADC driver Enhancements and bug fixes Manish Narani
2018-07-23 15:01 ` Manish Narani
2018-07-23 15:02 ` [PATCH v2 1/4] iio: adc: xilinx: Check for return values in clk related functions Manish Narani
2018-07-23 15:02 ` Manish Narani
2018-07-29 11:48 ` Jonathan Cameron
2018-07-29 11:48 ` Jonathan Cameron
2018-07-23 15:02 ` [PATCH v2 2/4] iio: adc: xilinx: limit pcap clock frequency value Manish Narani
2018-07-23 15:02 ` Manish Narani
2018-07-29 11:51 ` Jonathan Cameron
2018-07-29 11:51 ` Jonathan Cameron
2018-07-30 10:13 ` Manish Narani
2018-07-30 10:13 ` Manish Narani
2018-07-30 10:13 ` Manish Narani
2018-07-23 15:02 ` [PATCH v2 3/4] iio: adc: xilinx: Remove platform_get_irq from xadc_remove function Manish Narani
2018-07-23 15:02 ` Manish Narani
2018-07-29 12:29 ` Jonathan Cameron [this message]
2018-07-29 12:29 ` Jonathan Cameron
2018-07-23 15:02 ` [PATCH v2 4/4] iio: adc: xilinx: Move request_irq before enabling interrupts Manish Narani
2018-07-23 15:02 ` Manish Narani
2018-07-29 12:30 ` Jonathan Cameron
2018-07-29 12:30 ` Jonathan Cameron
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=20180729132935.28996ab6@archlinux \
--to=jic23@kernel.org \
--cc=anirudh@xilinx.com \
--cc=knaack.h@gmx.de \
--cc=lakshmi.sai.krishna.potthuri@xilinx.com \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manish.narani@xilinx.com \
--cc=michal.simek@xilinx.com \
--cc=pmeerw@pmeerw.net \
--cc=sgoud@xilinx.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.