From: Peter Rosin <peda@axentia.se>
To: Federico Vaga <federico.vaga@cern.ch>,
Peter Korsgaard <peter@korsgaard.com>,
Andrew Lunn <andrew@lunn.ch>
Cc: "linux-i2c@vger.kernel.org" <linux-i2c@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v5 5/5] i2c:ocores: checkpatch fixes
Date: Mon, 11 Feb 2019 16:12:23 +0000 [thread overview]
Message-ID: <bbaaa303-75f1-9272-c01f-914175237f05@axentia.se> (raw)
In-Reply-To: <20190211160529.23858-6-federico.vaga@cern.ch>
On 2019-02-11 17:05, Federico Vaga wrote:
> Miscellaneous style fixes from checkpatch
>
> Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
> ---
> drivers/i2c/busses/i2c-ocores.c | 30 +++++++++++++++++++-----------
> 1 file changed, 19 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
> index 78085a8..54b2156 100644
> --- a/drivers/i2c/busses/i2c-ocores.c
> +++ b/drivers/i2c/busses/i2c-ocores.c
> @@ -179,8 +179,9 @@ static void ocores_process(struct ocores_i2c *i2c, u8 stat)
> oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_STOP);
> goto out;
> }
> - } else
> + } else {
> msg->buf[i2c->pos++] = oc_getreg(i2c, OCI2C_DATA);
> + }
>
> /* end of msg? */
> if (i2c->pos == msg->len) {
> @@ -197,11 +198,11 @@ static void ocores_process(struct ocores_i2c *i2c, u8 stat)
> i2c->state = STATE_START;
>
> oc_setreg(i2c, OCI2C_DATA, addr);
> - oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_START);
> + oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_START);
> goto out;
> - } else
> - i2c->state = (msg->flags & I2C_M_RD)
> - ? STATE_READ : STATE_WRITE;
> + }
> + i2c->state = (msg->flags & I2C_M_RD)
> + ? STATE_READ : STATE_WRITE;
> } else {
> i2c->state = STATE_DONE;
> oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_STOP);
> @@ -461,13 +462,16 @@ static const struct of_device_id ocores_i2c_match[] = {
> MODULE_DEVICE_TABLE(of, ocores_i2c_match);
>
> #ifdef CONFIG_OF
> -/* Read and write functions for the GRLIB port of the controller. Registers are
> +/*
> + * Read and write functions for the GRLIB port of the controller. Registers are
> * 32-bit big endian and the PRELOW and PREHIGH registers are merged into one
> - * register. The subsequent registers has their offset decreased accordingly. */
> + * register. The subsequent registers have their offsets decreased accordingly.
> + */
> static u8 oc_getreg_grlib(struct ocores_i2c *i2c, int reg)
> {
> u32 rd;
> int rreg = reg;
> +
> if (reg != OCI2C_PRELOW)
> rreg--;
> rd = ioread32be(i2c->base + (rreg << i2c->reg_shift));
> @@ -481,6 +485,7 @@ static void oc_setreg_grlib(struct ocores_i2c *i2c, int reg, u8 value)
> {
> u32 curr, wr;
> int rreg = reg;
> +
> if (reg != OCI2C_PRELOW)
> rreg--;
> if (reg == OCI2C_PRELOW || reg == OCI2C_PREHIGH) {
> @@ -569,7 +574,7 @@ static int ocores_i2c_of_probe(struct platform_device *pdev,
> return 0;
> }
> #else
> -#define ocores_i2c_of_probe(pdev,i2c) -ENODEV
> +#define ocores_i2c_of_probe(pdev, i2c) -ENODEV
> #endif
>
> static int ocores_i2c_probe(struct platform_device *pdev)
> @@ -686,10 +691,11 @@ err_clk:
> static int ocores_i2c_remove(struct platform_device *pdev)
> {
> struct ocores_i2c *i2c = platform_get_drvdata(pdev);
> + u8 ctrl = oc_getreg(i2c, OCI2C_CONTROL);
>
> /* disable i2c logic */
> - oc_setreg(i2c, OCI2C_CONTROL, oc_getreg(i2c, OCI2C_CONTROL)
> - & ~(OCI2C_CTRL_EN|OCI2C_CTRL_IEN));
> + ctrl &= ~(OCI2C_CTRL_EN | OCI2C_CTRL_IEN);
> + oc_setreg(i2c, OCI2C_CONTROL, ctrl);
>
> /* remove adapter & data */
> i2c_del_adapter(&i2c->adap);
> @@ -707,7 +713,9 @@ static int ocores_i2c_suspend(struct device *dev)
> u8 ctrl = oc_getreg(i2c, OCI2C_CONTROL);
>
> /* make sure the device is disabled */
> - oc_setreg(i2c, OCI2C_CONTROL, ctrl & ~(OCI2C_CTRL_EN|OCI2C_CTRL_IEN));
> + ctrl = oc_getreg(i2c, OCI2C_CONTROL);
There's a pointless double oc_getreg(i2c, OCI2C_CONTROL).
Cheers,
Peter
> + ctrl &= ~(OCI2C_CTRL_EN | OCI2C_CTRL_IEN);
> + oc_setreg(i2c, OCI2C_CONTROL, ctrl);
>
> if (!IS_ERR(i2c->clk))
> clk_disable_unprepare(i2c->clk);
>
next prev parent reply other threads:[~2019-02-11 16:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-11 16:05 [PATCH v5 0/5] i2c:ocores: improvements Federico Vaga
2019-02-11 16:05 ` [PATCH v5 1/5] i2c:ocores: stop transfer on timeout Federico Vaga
2019-02-11 16:05 ` [PATCH v5 2/5] i2c:ocores: do not handle IRQ if IF is not set Federico Vaga
2019-02-11 16:05 ` [PATCH v5 3/5] i2c:ocores: add polling interface Federico Vaga
2019-02-11 16:05 ` [PATCH v5 4/5] i2c:ocores: add SPDX tag Federico Vaga
2019-02-11 16:05 ` [PATCH v5 5/5] i2c:ocores: checkpatch fixes Federico Vaga
2019-02-11 16:12 ` Peter Rosin [this message]
2019-02-11 16:18 ` Federico Vaga
2019-02-11 16:19 ` Wolfram Sang
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=bbaaa303-75f1-9272-c01f-914175237f05@axentia.se \
--to=peda@axentia.se \
--cc=andrew@lunn.ch \
--cc=federico.vaga@cern.ch \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter@korsgaard.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).