Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dm: fsl_i2c: Rename methods for reading/writing data

Browse Source 
Signed-off-by: Mario Six <mario.six@gdsys.cc>
master
mario.six@gdsys.cc 8 years ago committed by Heiko Schocher
parent 16579ecbcc
commit 00b61553f1
1 changed files with 8 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      drivers/i2c/fsl_i2c.c

16
drivers/i2c/fsl_i2c.c
Unescape View File

@ -366,7 +366,7 @@ i2c_write_addr(struct i2c_adapter *adap, u8 dev, u8 dir, int rsta)
} }
static __inline__ int static __inline__ int
__i2c_write(struct i2c_adapter *adap, u8 *data, int length) __i2c_write_data(struct i2c_adapter *adap, u8 *data, int length)
{ {
struct fsl_i2c_base *base = struct fsl_i2c_base *base =
(struct fsl_i2c_base *)i2c_base[adap->hwadapnr]; (struct fsl_i2c_base *)i2c_base[adap->hwadapnr];
@ -383,7 +383,7 @@ __i2c_write(struct i2c_adapter *adap, u8 *data, int length)
} }
static __inline__ int static __inline__ int
__i2c_read(struct i2c_adapter *adap, u8 *data, int length) __i2c_read_data(struct i2c_adapter *adap, u8 *data, int length)
{ {
struct fsl_i2c_base *base = struct fsl_i2c_base *base =
(struct fsl_i2c_base *)i2c_base[adap->hwadapnr]; (struct fsl_i2c_base *)i2c_base[adap->hwadapnr];
@ -436,23 +436,23 @@ fsl_i2c_read(struct i2c_adapter *adap, u8 chip_addr, uint offset, int olen,
*/ */
if (olen < 0) { if (olen < 0) {
if (i2c_write_addr(adap, chip_addr, I2C_WRITE_BIT, 0) != 0) if (i2c_write_addr(adap, chip_addr, I2C_WRITE_BIT, 0) != 0)
ret = __i2c_write(adap, data, -olen); ret = __i2c_write_data(adap, data, -olen);
if (ret != -olen) if (ret != -olen)
return -1; return -1;
if (dlen && i2c_write_addr(adap, chip_addr, if (dlen && i2c_write_addr(adap, chip_addr,
I2C_READ_BIT, 1) != 0) I2C_READ_BIT, 1) != 0)
ret = __i2c_read(adap, data, dlen); ret = __i2c_read_data(adap, data, dlen);
} else { } else {
if ((!dlen || olen > 0) && if ((!dlen || olen > 0) &&
i2c_write_addr(adap, chip_addr, I2C_WRITE_BIT, 0) != 0 && i2c_write_addr(adap, chip_addr, I2C_WRITE_BIT, 0) != 0 &&
__i2c_write(adap, &o[4 - olen], olen) == olen) __i2c_write_data(adap, &o[4 - olen], olen) == olen)
ret = 0; /* No error so far */ ret = 0; /* No error so far */
if (dlen && i2c_write_addr(adap, chip_addr, I2C_READ_BIT, if (dlen && i2c_write_addr(adap, chip_addr, I2C_READ_BIT,
olen ? 1 : 0) != 0) olen ? 1 : 0) != 0)
ret = __i2c_read(adap, data, dlen); ret = __i2c_read_data(adap, data, dlen);
} }
writeb(I2C_CR_MEN, &base->cr); writeb(I2C_CR_MEN, &base->cr);
@ -479,8 +479,8 @@ fsl_i2c_write(struct i2c_adapter *adap, u8 chip_addr, uint offset, int olen,
return -1; return -1;
if (i2c_write_addr(adap, chip_addr, I2C_WRITE_BIT, 0) != 0 && if (i2c_write_addr(adap, chip_addr, I2C_WRITE_BIT, 0) != 0 &&
__i2c_write(adap, &o[4 - olen], olen) == olen) { __i2c_write_data(adap, &o[4 - olen], olen) == olen) {
ret = __i2c_write(adap, data, dlen); ret = __i2c_write_data(adap, data, dlen);
} }
writeb(I2C_CR_MEN, &base->cr); writeb(I2C_CR_MEN, &base->cr);

Write Preview
Loading…
Cancel
Save