@@ -122,10 +122,9 @@ static int wmt_check_status(struct wmt_i2c_dev *i2c_dev)
122
122
return ret ;
123
123
}
124
124
125
- static int wmt_i2c_write (struct i2c_adapter * adap , struct i2c_msg * pmsg ,
125
+ static int wmt_i2c_write (struct wmt_i2c_dev * i2c_dev , struct i2c_msg * pmsg ,
126
126
int last )
127
127
{
128
- struct wmt_i2c_dev * i2c_dev = i2c_get_adapdata (adap );
129
128
u16 val , tcr_val = i2c_dev -> tcr ;
130
129
int ret ;
131
130
int xfer_len = 0 ;
@@ -195,10 +194,8 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,
195
194
return 0 ;
196
195
}
197
196
198
- static int wmt_i2c_read (struct i2c_adapter * adap , struct i2c_msg * pmsg ,
199
- int last )
197
+ static int wmt_i2c_read (struct wmt_i2c_dev * i2c_dev , struct i2c_msg * pmsg )
200
198
{
201
- struct wmt_i2c_dev * i2c_dev = i2c_get_adapdata (adap );
202
199
u16 val , tcr_val = i2c_dev -> tcr ;
203
200
int ret ;
204
201
u32 xfer_len = 0 ;
@@ -262,13 +259,11 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,
262
259
int num )
263
260
{
264
261
struct i2c_msg * pmsg ;
265
- int i , is_last ;
262
+ int i ;
266
263
int ret = 0 ;
267
264
struct wmt_i2c_dev * i2c_dev = i2c_get_adapdata (adap );
268
265
269
266
for (i = 0 ; ret >= 0 && i < num ; i ++ ) {
270
- is_last = ((i + 1 ) == num );
271
-
272
267
pmsg = & msgs [i ];
273
268
if (!(pmsg -> flags & I2C_M_NOSTART )) {
274
269
ret = wmt_i2c_wait_bus_not_busy (i2c_dev );
@@ -277,9 +272,9 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,
277
272
}
278
273
279
274
if (pmsg -> flags & I2C_M_RD )
280
- ret = wmt_i2c_read (adap , pmsg , is_last );
275
+ ret = wmt_i2c_read (i2c_dev , pmsg );
281
276
else
282
- ret = wmt_i2c_write (adap , pmsg , is_last );
277
+ ret = wmt_i2c_write (i2c_dev , pmsg , ( i + 1 ) == num );
283
278
}
284
279
285
280
return (ret < 0 ) ? ret : i ;
0 commit comments