From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
To: Wolfram Sang <wsa+renesas@sang-engineering.com>,
linux-i2c@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] media: i2c: adv7842: remove open coded version of SMBus block write
Date: Mon, 25 Jan 2021 10:56:42 +0100 [thread overview]
Message-ID: <df22c72d-cbae-0e87-8448-9dbcabbc5823@xs4all.nl> (raw)
In-Reply-To: <20210119093912.1838-2-wsa+renesas@sang-engineering.com>
On 19/01/2021 10:39, Wolfram Sang wrote:
> The version here is identical to the one in the I2C core, so use the
> latter version directly.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Looks good to me!
Hans
> ---
>
> Changes since RFC:
> * skip define, use i2c_smbus_write_i2c_block_data directly
>
> drivers/media/i2c/adv7842.c | 24 +++++-------------------
> 1 file changed, 5 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
> index 0855f648416d..e0629d5ef17b 100644
> --- a/drivers/media/i2c/adv7842.c
> +++ b/drivers/media/i2c/adv7842.c
> @@ -343,20 +343,6 @@ static void adv_smbus_write_byte_no_check(struct i2c_client *client,
> I2C_SMBUS_BYTE_DATA, &data);
> }
>
> -static s32 adv_smbus_write_i2c_block_data(struct i2c_client *client,
> - u8 command, unsigned length, const u8 *values)
> -{
> - union i2c_smbus_data data;
> -
> - if (length > I2C_SMBUS_BLOCK_MAX)
> - length = I2C_SMBUS_BLOCK_MAX;
> - data.block[0] = length;
> - memcpy(data.block + 1, values, length);
> - return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
> - I2C_SMBUS_WRITE, command,
> - I2C_SMBUS_I2C_BLOCK_DATA, &data);
> -}
> -
> /* ----------------------------------------------------------------------- */
>
> static inline int io_read(struct v4l2_subdev *sd, u8 reg)
> @@ -741,7 +727,7 @@ static int edid_write_vga_segment(struct v4l2_subdev *sd)
> rep_write_and_or(sd, 0x77, 0xef, 0x10);
>
> for (i = 0; !err && i < 256; i += I2C_SMBUS_BLOCK_MAX)
> - err = adv_smbus_write_i2c_block_data(state->i2c_edid, i,
> + err = i2c_smbus_write_i2c_block_data(state->i2c_edid, i,
> I2C_SMBUS_BLOCK_MAX, val + i);
> if (err)
> return err;
> @@ -807,7 +793,7 @@ static int edid_write_hdmi_segment(struct v4l2_subdev *sd, u8 port)
> rep_write_and_or(sd, 0x77, 0xef, 0x00);
>
> for (i = 0; !err && i < 256; i += I2C_SMBUS_BLOCK_MAX)
> - err = adv_smbus_write_i2c_block_data(state->i2c_edid, i,
> + err = i2c_smbus_write_i2c_block_data(state->i2c_edid, i,
> I2C_SMBUS_BLOCK_MAX, edid + i);
> if (err)
> return err;
> @@ -1079,7 +1065,7 @@ static void configure_custom_video_timings(struct v4l2_subdev *sd,
> /* Should only be set in auto-graphics mode [REF_02, p. 91-92] */
> /* setup PLL_DIV_MAN_EN and PLL_DIV_RATIO */
> /* IO-map reg. 0x16 and 0x17 should be written in sequence */
> - if (adv_smbus_write_i2c_block_data(client, 0x16, 2, pll)) {
> + if (i2c_smbus_write_i2c_block_data(client, 0x16, 2, pll)) {
> v4l2_err(sd, "writing to reg 0x16 and 0x17 failed\n");
> break;
> }
> @@ -1135,7 +1121,7 @@ static void adv7842_set_offset(struct v4l2_subdev *sd, bool auto_offset, u16 off
> offset_buf[3] = offset_c & 0x0ff;
>
> /* Registers must be written in this order with no i2c access in between */
> - if (adv_smbus_write_i2c_block_data(state->i2c_cp, 0x77, 4, offset_buf))
> + if (i2c_smbus_write_i2c_block_data(state->i2c_cp, 0x77, 4, offset_buf))
> v4l2_err(sd, "%s: i2c error writing to CP reg 0x77, 0x78, 0x79, 0x7a\n", __func__);
> }
>
> @@ -1164,7 +1150,7 @@ static void adv7842_set_gain(struct v4l2_subdev *sd, bool auto_gain, u16 gain_a,
> gain_buf[3] = ((gain_c & 0x0ff));
>
> /* Registers must be written in this order with no i2c access in between */
> - if (adv_smbus_write_i2c_block_data(state->i2c_cp, 0x73, 4, gain_buf))
> + if (i2c_smbus_write_i2c_block_data(state->i2c_cp, 0x73, 4, gain_buf))
> v4l2_err(sd, "%s: i2c error writing to CP reg 0x73, 0x74, 0x75, 0x76\n", __func__);
> }
>
>
next prev parent reply other threads:[~2021-01-26 20:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 9:39 [PATCH 0/3] treewide: remove open coded SMBus block transfers Wolfram Sang
2021-01-19 9:39 ` [PATCH 1/3] media: i2c: adv7842: remove open coded version of SMBus block write Wolfram Sang
2021-01-25 9:56 ` Hans Verkuil [this message]
2021-01-19 9:39 ` [PATCH 2/3] media: i2c: adv7511: remove open coded version of SMBus block read Wolfram Sang
2021-01-25 10:05 ` Hans Verkuil
2021-01-27 10:18 ` Wolfram Sang
2021-01-19 9:39 ` [PATCH 3/3] ipmi: remove open coded version of SMBus block write 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=df22c72d-cbae-0e87-8448-9dbcabbc5823@xs4all.nl \
--to=hverkuil-cisco@xs4all.nl \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=wsa+renesas@sang-engineering.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
all inboxes | Powered by JetHome®