From: gregory.clement@free-electrons•com (Gregory CLEMENT)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 3/5] i2c: mv64xxx: refactor send_start
Date: Fri, 14 Feb 2014 12:42:28 +0100 [thread overview]
Message-ID: <52FE0124.6090808@free-electrons.com> (raw)
In-Reply-To: <1392323793-4125-4-git-send-email-wsa@the-dreams.de>
On 13/02/2014 21:36, Wolfram Sang wrote:
> For start and restart, we are doing the same thing. Let's consolidate
> that.
>
> Signed-off-by: Wolfram Sang <wsa@the-dreams•de>
With my first tests it continue to work with this change,
but I want to have a closer look on it
Thanks,
Gregory
> ---
> drivers/i2c/busses/i2c-mv64xxx.c | 30 ++++++++++++++++--------------
> 1 file changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
> index d52d849..9c37b59 100644
> --- a/drivers/i2c/busses/i2c-mv64xxx.c
> +++ b/drivers/i2c/busses/i2c-mv64xxx.c
> @@ -419,6 +419,17 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)
> }
> }
>
> +static void mv64xxx_i2c_send_start(struct mv64xxx_i2c_data *drv_data)
> +{
> + /* Can we offload this msg ? */
> + if (mv64xxx_i2c_offload_msg(drv_data) < 0) {
> + /* No, switch to standard path */
> + mv64xxx_i2c_prepare_for_io(drv_data, drv_data->msgs);
> + writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_START,
> + drv_data->reg_base + drv_data->reg_offsets.control);
> + }
> +}
> +
> static void
> mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
> {
> @@ -435,14 +446,11 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
>
> drv_data->msgs++;
> drv_data->num_msgs--;
> - if (mv64xxx_i2c_offload_msg(drv_data) < 0) {
> - drv_data->cntl_bits |= MV64XXX_I2C_REG_CONTROL_START;
> - writel(drv_data->cntl_bits,
> - drv_data->reg_base + drv_data->reg_offsets.control);
> + // CHECKME: Does it work? Order of writel and prepare_for_io is
> + // exchanged. Also, do we need to change cntl_bits in drv_data
> + // with |= MV64XXX_I2C_REG_CONTROL_START?
> + mv64xxx_i2c_send_start(drv_data);
>
> - /* Setup for the next message */
> - mv64xxx_i2c_prepare_for_io(drv_data, drv_data->msgs);
> - }
> if (drv_data->errata_delay)
> udelay(5);
>
> @@ -460,13 +468,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
> break;
>
> case MV64XXX_I2C_ACTION_SEND_START:
> - /* Can we offload this msg ? */
> - if (mv64xxx_i2c_offload_msg(drv_data) < 0) {
> - /* No, switch to standard path */
> - mv64xxx_i2c_prepare_for_io(drv_data, drv_data->msgs);
> - writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_START,
> - drv_data->reg_base + drv_data->reg_offsets.control);
> - }
> + mv64xxx_i2c_send_start(drv_data);
> break;
>
> case MV64XXX_I2C_ACTION_SEND_ADDR_1:
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2014-02-14 11:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-07 10:55 [PATCH] i2c: mv64xxx: Fix locked bus when offload is selected but not used on a message Gregory CLEMENT
2014-02-07 15:09 ` Jason Cooper
2014-02-07 15:18 ` Gregory CLEMENT
2014-02-07 18:09 ` Kevin Hilman
2014-02-07 18:13 ` Jason Cooper
2014-02-08 17:01 ` Jason Cooper
2014-02-13 9:41 ` Wolfram Sang
2014-02-13 14:23 ` Gregory CLEMENT
2014-02-13 20:36 ` [PATCH 0/5] mv64xxx updates Wolfram Sang
2014-02-13 20:36 ` [PATCH 1/5] i2c: mv64xxx: put offload check into offload prepare function Wolfram Sang
2014-02-14 11:38 ` Gregory CLEMENT
2014-02-13 20:36 ` [PATCH 2/5] i2c: mv64xxx: refactor message start to ensure proper initialization Wolfram Sang
2014-02-14 11:39 ` Gregory CLEMENT
2014-02-15 14:44 ` Wolfram Sang
2014-02-13 20:36 ` [PATCH 3/5] i2c: mv64xxx: refactor send_start Wolfram Sang
2014-02-14 11:42 ` Gregory CLEMENT [this message]
2014-02-13 20:36 ` [PATCH 4/5] i2c: mv64xxx: directly call send_start when initializing transfer Wolfram Sang
2014-02-13 20:36 ` [PATCH 5/5] i2c: mv64xxx: refactor initialization for new msgs Wolfram Sang
2014-02-13 20:41 ` [PATCH 0/5] mv64xxx updates Gregory CLEMENT
2014-03-10 16:25 ` Wolfram Sang
2014-02-13 20:51 ` Thomas Petazzoni
2014-02-18 11:29 ` Maxime Ripard
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=52FE0124.6090808@free-electrons.com \
--to=gregory.clement@free-electrons$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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