Skip to content

Commit 5e705f9

Browse files
Wolfram SangAndi Shyti
authored andcommitted
i2c: iop3xx: reword according to newest specification
Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Remove a useless comment while here. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
1 parent 8946eb1 commit 5e705f9

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

drivers/i2c/busses/i2c-iop3xx.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* - Make it work with IXP46x chips
2323
* - Cleanup function names, coding style, etc
2424
*
25-
* - writing to slave address causes latchup on iop331.
25+
* - writing to local target address causes latchup on iop331.
2626
* fix: driver refuses to address self.
2727
*/
2828

@@ -234,7 +234,7 @@ iop3xx_i2c_send_target_addr(struct i2c_algo_iop3xx_data *iop3xx_adap,
234234
int status;
235235
int rc;
236236

237-
/* avoid writing to my slave address (hangs on 80331),
237+
/* avoid writing to local target address (hangs on 80331),
238238
* forbidden in Intel developer manual
239239
*/
240240
if (msg->addr == MYSAR) {
@@ -349,12 +349,9 @@ iop3xx_i2c_handle_msg(struct i2c_adapter *i2c_adap, struct i2c_msg *pmsg)
349349
}
350350
}
351351

352-
/*
353-
* master_xfer() - main read/write entry
354-
*/
355352
static int
356-
iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
357-
int num)
353+
iop3xx_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
354+
int num)
358355
{
359356
struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data;
360357
int im = 0;
@@ -384,8 +381,8 @@ iop3xx_i2c_func(struct i2c_adapter *adap)
384381
}
385382

386383
static const struct i2c_algorithm iop3xx_i2c_algo = {
387-
.master_xfer = iop3xx_i2c_master_xfer,
388-
.functionality = iop3xx_i2c_func,
384+
.xfer = iop3xx_i2c_xfer,
385+
.functionality = iop3xx_i2c_func,
389386
};
390387

391388
static void

0 commit comments

Comments
 (0)