Re: [PATCH 64/64] i2c: reword i2c_algorithm in drivers according to newest specification

Jarkko Nikula
2024-03-25T07:54:06Z

On 3/22/24 3:25 PM, Wolfram Sang wrote:
> Match the wording in i2c_algorithm in I2C drivers wrt. the newest I2C
> v7, SMBus 3.2, I3C specifications and replace "master/slave" with more
> appropriate terms. For some drivers, this means no more conversions are
> needed. For the others more work needs to be done but this will be
> performed incrementally along with API changes/improvements. All these
> changes here are simple search/replace results.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
> drivers/i2c/busses/i2c-amd-mp2-plat.c | 2 +-
> drivers/i2c/busses/i2c-at91-master.c | 2 +-
> drivers/i2c/busses/i2c-at91-slave.c | 8 ++++----
> drivers/i2c/busses/i2c-axxia.c | 10 +++++-----
> drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +-
> drivers/i2c/busses/i2c-designware-master.c | 2 +-
> drivers/i2c/busses/i2c-designware-slave.c | 8 ++++----
> drivers/i2c/busses/i2c-diolan-u2c.c | 2 +-
> drivers/i2c/busses/i2c-exynos5.c | 4 ++--
> drivers/i2c/busses/i2c-gxp.c | 12 ++++++------
> drivers/i2c/busses/i2c-hisi.c | 4 ++--
> drivers/i2c/busses/i2c-img-scb.c | 2 +-
> drivers/i2c/busses/i2c-imx.c | 12 ++++++------
> drivers/i2c/busses/i2c-jz4780.c | 2 +-
> drivers/i2c/busses/i2c-kempld.c | 2 +-
> drivers/i2c/busses/i2c-meson.c | 4 ++--
> drivers/i2c/busses/i2c-mlxbf.c | 8 ++++----
> drivers/i2c/busses/i2c-mt65xx.c | 2 +-
> drivers/i2c/busses/i2c-mxs.c | 2 +-
> drivers/i2c/busses/i2c-nomadik.c | 2 +-
> drivers/i2c/busses/i2c-npcm7xx.c | 12 ++++++------
> drivers/i2c/busses/i2c-nvidia-gpu.c | 4 ++--
> drivers/i2c/busses/i2c-ocores.c | 8 ++++----
> drivers/i2c/busses/i2c-octeon-platdrv.c | 2 +-
> drivers/i2c/busses/i2c-omap.c | 4 ++--
> drivers/i2c/busses/i2c-opal.c | 4 ++--
> drivers/i2c/busses/i2c-pasemi-core.c | 2 +-
> drivers/i2c/busses/i2c-pnx.c | 2 +-
> drivers/i2c/busses/i2c-pxa.c | 12 ++++++------
> drivers/i2c/busses/i2c-qcom-cci.c | 2 +-
> drivers/i2c/busses/i2c-qcom-geni.c | 2 +-
> drivers/i2c/busses/i2c-robotfuzz-osif.c | 2 +-
> drivers/i2c/busses/i2c-rzv2m.c | 8 ++++----
> drivers/i2c/busses/i2c-s3c2410.c | 4 ++--
> drivers/i2c/busses/i2c-stm32f7.c | 14 +++++++-------
> drivers/i2c/busses/i2c-tegra-bpmp.c | 4 ++--
> drivers/i2c/busses/i2c-tegra.c | 4 ++--
> drivers/i2c/busses/i2c-thunderx-pcidrv.c | 2 +-
> drivers/i2c/busses/i2c-virtio.c | 2 +-
> drivers/i2c/busses/i2c-wmt.c | 2 +-
> drivers/i2c/busses/i2c-xiic.c | 2 +-
> 41 files changed, 95 insertions(+), 95 deletions(-)
>

> diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
> index c7e56002809a..14c61b31f877 100644
> --- a/drivers/i2c/busses/i2c-designware-master.c
> +++ b/drivers/i2c/busses/i2c-designware-master.c
> @@ -832,7 +832,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
> }
>
> static const struct i2c_algorithm i2c_dw_algo = {
> - .master_xfer = i2c_dw_xfer,
> + .xfer = i2c_dw_xfer,
> .functionality = i2c_dw_func,
> };
>
> diff --git a/drivers/i2c/busses/i2c-designware-slave.c b/drivers/i2c/busses/i2c-designware-slave.c
> index 2e079cf20bb5..b47ad6b16814 100644
> --- a/drivers/i2c/busses/i2c-designware-slave.c
> +++ b/drivers/i2c/busses/i2c-designware-slave.c
> @@ -58,7 +58,7 @@ static int i2c_dw_init_slave(struct dw_i2c_dev *dev)
> return 0;
> }
>
> -static int i2c_dw_reg_slave(struct i2c_client *slave)
> +static int i2c_dw_reg_target(struct i2c_client *slave)
> {
> struct dw_i2c_dev *dev = i2c_get_adapdata(slave->adapter);
>
> @@ -83,7 +83,7 @@ static int i2c_dw_reg_slave(struct i2c_client *slave)
> return 0;
> }
>
> -static int i2c_dw_unreg_slave(struct i2c_client *slave)
> +static int i2c_dw_unreg_target(struct i2c_client *slave)
> {
> struct dw_i2c_dev *dev = i2c_get_adapdata(slave->adapter);
>
> @@ -214,8 +214,8 @@ static irqreturn_t i2c_dw_isr_slave(int this_irq, void *dev_id)
>
> static const struct i2c_algorithm i2c_dw_algo = {
> .functionality = i2c_dw_func,
> - .reg_slave = i2c_dw_reg_slave,
> - .unreg_slave = i2c_dw_unreg_slave,
> + .reg_target = i2c_dw_reg_target,
> + .unreg_target = i2c_dw_unreg_target,
> };

Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>