From: Jonathan Cameron <jic23@kernel.org>
To: Lars-Peter Clausen <lars@metafoo.de>
Cc: Manish Narani <manish.narani@xilinx.com>,
knaack.h@gmx.de, pmeerw@pmeerw.net, michal.simek@xilinx.com,
linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, anirudh@xilinx.com,
sgoud@xilinx.com
Subject: Re: [PATCH 3/4] iio: adc: xilinx: Check for return values in clk related functions
Date: Sat, 21 Jul 2018 17:24:23 +0100 [thread overview]
Message-ID: <20180721172423.11efb5ea@archlinux> (raw)
In-Reply-To: <f4b8e687-217f-15b1-b0b1-b95dbc3dcc2a@metafoo.de>
On Thu, 19 Jul 2018 18:40:26 +0200
Lars-Peter Clausen <lars@metafoo.de> wrote:
> On 07/18/2018 01:12 PM, Manish Narani wrote:
> > This patch adds check for return values from clock related functions.
> > This was reported by static code analysis tool.
>
> This patch seems to do something else.
Indeed, definitely doing two things only one of which is mentioned.
Please break it up and resend.
Jonathan
>
> >
> > Signed-off-by: Manish Narani <manish.narani@xilinx.com>
> > ---
> > drivers/iio/adc/xilinx-xadc-core.c | 24 ++++++++++++++++++++++--
> > 1 file changed, 22 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
> > index 248cffa..47eb364 100644
> > --- a/drivers/iio/adc/xilinx-xadc-core.c
> > +++ b/drivers/iio/adc/xilinx-xadc-core.c
> > @@ -322,6 +322,7 @@ static irqreturn_t xadc_zynq_interrupt_handler(int irq, void *devid)
> >
> > #define XADC_ZYNQ_TCK_RATE_MAX 50000000
> > #define XADC_ZYNQ_IGAP_DEFAULT 20
> > +#define XADC_ZYNQ_PCAP_RATE_MAX 200000000
> >
> > static int xadc_zynq_setup(struct platform_device *pdev,
> > struct iio_dev *indio_dev, int irq)
> > @@ -332,6 +333,7 @@ static int xadc_zynq_setup(struct platform_device *pdev,
> > unsigned int div;
> > unsigned int igap;
> > unsigned int tck_rate;
> > + int ret;
> >
> > /* TODO: Figure out how to make igap and tck_rate configurable */
> > igap = XADC_ZYNQ_IGAP_DEFAULT;
> > @@ -341,6 +343,13 @@ static int xadc_zynq_setup(struct platform_device *pdev,
> >
> > pcap_rate = clk_get_rate(xadc->clk);
> >
> > + if (pcap_rate > XADC_ZYNQ_PCAP_RATE_MAX) {
> > + ret = clk_set_rate(xadc->clk,
> > + (unsigned long)XADC_ZYNQ_PCAP_RATE_MAX);
> > + if (ret)
> > + return ret;
> > + }
> > +
> > if (tck_rate > pcap_rate / 2) {
> > div = 2;
> > } else {
> > @@ -366,6 +375,12 @@ static int xadc_zynq_setup(struct platform_device *pdev,
> > XADC_ZYNQ_CFG_REDGE | XADC_ZYNQ_CFG_WEDGE |
> > tck_div | XADC_ZYNQ_CFG_IGAP(igap));
> >
> > + if (pcap_rate > XADC_ZYNQ_PCAP_RATE_MAX) {
> > + ret = clk_set_rate(xadc->clk, pcap_rate);
> > + if (ret)
> > + return ret;
> > + }
> > +
> > return 0;
> > }
> >
> > @@ -887,6 +902,9 @@ static int xadc_write_raw(struct iio_dev *indio_dev,
> > unsigned long clk_rate = xadc_get_dclk_rate(xadc);
> > unsigned int div;
> >
> > + if (!clk_rate)
> > + return -EINVAL;
> > +
> > if (info != IIO_CHAN_INFO_SAMP_FREQ)
> > return -EINVAL;
> >
> > @@ -1239,8 +1257,10 @@ static int xadc_probe(struct platform_device *pdev)
> > goto err_free_irq;
> >
> > /* Disable all alarms */
> > - xadc_update_adc_reg(xadc, XADC_REG_CONF1, XADC_CONF1_ALARM_MASK,
> > - XADC_CONF1_ALARM_MASK);
> > + ret = xadc_update_adc_reg(xadc, XADC_REG_CONF1, XADC_CONF1_ALARM_MASK,
> > + XADC_CONF1_ALARM_MASK);
> > + if (ret)
> > + goto err_free_irq;
> >
> > /* Set thresholds to min/max */
> > for (i = 0; i < 16; i++) {
> >
>
next prev parent reply other threads:[~2018-07-21 16:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 11:12 [PATCH 0/4] iio: adc: xilinx: XADC driver enhancements and bug fixes Manish Narani
2018-07-18 11:12 ` [PATCH 1/4] iio: adc: xilinx: Rename 'channels' variable name to 'iio_xadc_channels' Manish Narani
2018-07-18 11:18 ` Lars-Peter Clausen
2018-07-18 11:52 ` Manish Narani
2018-07-19 8:22 ` Michal Simek
2018-07-21 16:18 ` Jonathan Cameron
2018-07-21 16:22 ` Joe Perches
2018-07-21 16:33 ` Jonathan Cameron
2018-07-18 11:12 ` [PATCH 2/4] iio: adc: xilinx: Remove dead code from xadc_zynq_setup Manish Narani
2018-07-21 16:22 ` Jonathan Cameron
2018-07-18 11:12 ` [PATCH 3/4] iio: adc: xilinx: Check for return values in clk related functions Manish Narani
2018-07-19 16:40 ` Lars-Peter Clausen
2018-07-21 16:24 ` Jonathan Cameron [this message]
2018-07-23 9:34 ` Manish Narani
2018-07-18 11:12 ` [PATCH 4/4] iio: adc: xilinx: Use devm_ functions while requesting irq Manish Narani
2018-07-19 16:37 ` Lars-Peter Clausen
2018-07-23 9:27 ` Manish Narani
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=20180721172423.11efb5ea@archlinux \
--to=jic23@kernel.org \
--cc=anirudh@xilinx.com \
--cc=knaack.h@gmx.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).