@@ -122,10 +122,9 @@ static int wmt_check_status(struct wmt_i2c_dev *i2c_dev)
122122 return ret ;
123123}
124124
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 ,
126126 int last )
127127{
128- struct wmt_i2c_dev * i2c_dev = i2c_get_adapdata (adap );
129128 u16 val , tcr_val = i2c_dev -> tcr ;
130129 int ret ;
131130 int xfer_len = 0 ;
@@ -195,10 +194,8 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,
195194 return 0 ;
196195}
197196
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 )
200198{
201- struct wmt_i2c_dev * i2c_dev = i2c_get_adapdata (adap );
202199 u16 val , tcr_val = i2c_dev -> tcr ;
203200 int ret ;
204201 u32 xfer_len = 0 ;
@@ -262,13 +259,11 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,
262259 int num )
263260{
264261 struct i2c_msg * pmsg ;
265- int i , is_last ;
262+ int i ;
266263 int ret = 0 ;
267264 struct wmt_i2c_dev * i2c_dev = i2c_get_adapdata (adap );
268265
269266 for (i = 0 ; ret >= 0 && i < num ; i ++ ) {
270- is_last = ((i + 1 ) == num );
271-
272267 pmsg = & msgs [i ];
273268 if (!(pmsg -> flags & I2C_M_NOSTART )) {
274269 ret = wmt_i2c_wait_bus_not_busy (i2c_dev );
@@ -277,9 +272,9 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,
277272 }
278273
279274 if (pmsg -> flags & I2C_M_RD )
280- ret = wmt_i2c_read (adap , pmsg , is_last );
275+ ret = wmt_i2c_read (i2c_dev , pmsg );
281276 else
282- ret = wmt_i2c_write (adap , pmsg , is_last );
277+ ret = wmt_i2c_write (i2c_dev , pmsg , ( i + 1 ) == num );
283278 }
284279
285280 return (ret < 0 ) ? ret : i ;
0 commit comments