@@ -76,7 +76,7 @@ static int ljca_i2c_init(struct ljca_i2c_dev *ljca_i2c, u8 id)
7676 return ret < 0 ? ret : 0 ;
7777}
7878
79- static int ljca_i2c_start (struct ljca_i2c_dev * ljca_i2c , u8 slave_addr ,
79+ static int ljca_i2c_start (struct ljca_i2c_dev * ljca_i2c , u8 target_addr ,
8080 enum ljca_xfer_type type )
8181{
8282 struct ljca_i2c_rw_packet * w_packet =
@@ -88,7 +88,7 @@ static int ljca_i2c_start(struct ljca_i2c_dev *ljca_i2c, u8 slave_addr,
8888
8989 w_packet -> id = ljca_i2c -> i2c_info -> id ;
9090 w_packet -> len = cpu_to_le16 (sizeof (* w_packet -> data ));
91- w_packet -> data [0 ] = (slave_addr << 1 ) | type ;
91+ w_packet -> data [0 ] = (target_addr << 1 ) | type ;
9292
9393 ret = ljca_transfer (ljca_i2c -> ljca , LJCA_I2C_START , (u8 * )w_packet ,
9494 struct_size (w_packet , data , 1 ), (u8 * )r_packet ,
@@ -107,7 +107,7 @@ static int ljca_i2c_start(struct ljca_i2c_dev *ljca_i2c, u8 slave_addr,
107107 return 0 ;
108108}
109109
110- static void ljca_i2c_stop (struct ljca_i2c_dev * ljca_i2c , u8 slave_addr )
110+ static void ljca_i2c_stop (struct ljca_i2c_dev * ljca_i2c , u8 target_addr )
111111{
112112 struct ljca_i2c_rw_packet * w_packet =
113113 (struct ljca_i2c_rw_packet * )ljca_i2c -> obuf ;
@@ -169,16 +169,16 @@ static int ljca_i2c_pure_read(struct ljca_i2c_dev *ljca_i2c, u8 *data, u8 len)
169169 return 0 ;
170170}
171171
172- static int ljca_i2c_read (struct ljca_i2c_dev * ljca_i2c , u8 slave_addr , u8 * data ,
172+ static int ljca_i2c_read (struct ljca_i2c_dev * ljca_i2c , u8 target_addr , u8 * data ,
173173 u8 len )
174174{
175175 int ret ;
176176
177- ret = ljca_i2c_start (ljca_i2c , slave_addr , LJCA_I2C_READ_XFER_TYPE );
177+ ret = ljca_i2c_start (ljca_i2c , target_addr , LJCA_I2C_READ_XFER_TYPE );
178178 if (!ret )
179179 ret = ljca_i2c_pure_read (ljca_i2c , data , len );
180180
181- ljca_i2c_stop (ljca_i2c , slave_addr );
181+ ljca_i2c_stop (ljca_i2c , target_addr );
182182
183183 return ret ;
184184}
@@ -213,16 +213,16 @@ static int ljca_i2c_pure_write(struct ljca_i2c_dev *ljca_i2c, u8 *data, u8 len)
213213 return 0 ;
214214}
215215
216- static int ljca_i2c_write (struct ljca_i2c_dev * ljca_i2c , u8 slave_addr ,
216+ static int ljca_i2c_write (struct ljca_i2c_dev * ljca_i2c , u8 target_addr ,
217217 u8 * data , u8 len )
218218{
219219 int ret ;
220220
221- ret = ljca_i2c_start (ljca_i2c , slave_addr , LJCA_I2C_WRITE_XFER_TYPE );
221+ ret = ljca_i2c_start (ljca_i2c , target_addr , LJCA_I2C_WRITE_XFER_TYPE );
222222 if (!ret )
223223 ret = ljca_i2c_pure_write (ljca_i2c , data , len );
224224
225- ljca_i2c_stop (ljca_i2c , slave_addr );
225+ ljca_i2c_stop (ljca_i2c , target_addr );
226226
227227 return ret ;
228228}
@@ -266,7 +266,7 @@ static const struct i2c_adapter_quirks ljca_i2c_quirks = {
266266};
267267
268268static const struct i2c_algorithm ljca_i2c_algo = {
269- .master_xfer = ljca_i2c_xfer ,
269+ .xfer = ljca_i2c_xfer ,
270270 .functionality = ljca_i2c_func ,
271271};
272272
0 commit comments