| Message ID | 20240322132619.6389-45-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | i2c: reword i2c_algorithm according to newest specification | expand |
On Fri, Mar 22, 2024 at 02:25:37PM +0100, Wolfram Sang wrote: > Match the wording of this driver wrt. the newest I2C v7, SMBus 3.2, I3C > specifications and replace "master/slave" with more appropriate terms. > They are also more specific because we distinguish now between a remote > entity ("client") and a local one ("target"). > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Bjorn Andersson <andersson@kernel.org> Regards, Bjorn > --- > drivers/i2c/busses/i2c-qup.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c > index 598102d16677..2aeb5c33a711 100644 > --- a/drivers/i2c/busses/i2c-qup.c > +++ b/drivers/i2c/busses/i2c-qup.c > @@ -380,7 +380,7 @@ static int qup_i2c_poll_state_mask(struct qup_i2c_dev *qup, > u32 state; > > /* > - * State transition takes 3 AHB clocks cycles + 3 I2C master clock > + * State transition takes 3 AHB clocks cycles + 3 I2C host clock > * cycles. So retry once after a 1uS delay. > */ > do { > @@ -1607,12 +1607,12 @@ static u32 qup_i2c_func(struct i2c_adapter *adap) > } > > static const struct i2c_algorithm qup_i2c_algo = { > - .master_xfer = qup_i2c_xfer, > + .xfer = qup_i2c_xfer, > .functionality = qup_i2c_func, > }; > > static const struct i2c_algorithm qup_i2c_algo_v2 = { > - .master_xfer = qup_i2c_xfer_v2, > + .xfer = qup_i2c_xfer_v2, > .functionality = qup_i2c_func, > }; > > -- > 2.43.0 >
diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index 598102d16677..2aeb5c33a711 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -380,7 +380,7 @@ static int qup_i2c_poll_state_mask(struct qup_i2c_dev *qup, u32 state; /* - * State transition takes 3 AHB clocks cycles + 3 I2C master clock + * State transition takes 3 AHB clocks cycles + 3 I2C host clock * cycles. So retry once after a 1uS delay. */ do { @@ -1607,12 +1607,12 @@ static u32 qup_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm qup_i2c_algo = { - .master_xfer = qup_i2c_xfer, + .xfer = qup_i2c_xfer, .functionality = qup_i2c_func, }; static const struct i2c_algorithm qup_i2c_algo_v2 = { - .master_xfer = qup_i2c_xfer_v2, + .xfer = qup_i2c_xfer_v2, .functionality = qup_i2c_func, };
Match the wording of this driver wrt. the newest I2C v7, SMBus 3.2, I3C specifications and replace "master/slave" with more appropriate terms. They are also more specific because we distinguish now between a remote entity ("client") and a local one ("target"). Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/busses/i2c-qup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)