hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i2c: sh_mobile: allow setup callback to return errno 

The setup callback will be more generic and, thus, need to be able to
return error codes. Change the return type to 'int' for that.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2017-12-18 22:57:57 +01:00 committed by Wolfram Sang
parent 9e42213116
commit 12742b6ac1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/i2c/busses/i2c-sh_mobile.c
View File

@ -149,7 +149,7 @@ struct sh_mobile_i2c_data {
struct sh_mobile_dt_config { struct sh_mobile_dt_config {
int clks_per_count; int clks_per_count;
void (*setup)(struct sh_mobile_i2c_data *pd); int (*setup)(struct sh_mobile_i2c_data *pd);
}; };
#define IIC_FLAG_HAS_ICIC67 (1 << 0) #define IIC_FLAG_HAS_ICIC67 (1 << 0)
@ -749,7 +749,7 @@ static const struct i2c_algorithm sh_mobile_i2c_algorithm = {
* r8a7740 chip has lasting errata on I2C I/O pad reset. * r8a7740 chip has lasting errata on I2C I/O pad reset.
* this is work-around for it. * this is work-around for it.
*/ */
static void sh_mobile_i2c_r8a7740_workaround(struct sh_mobile_i2c_data *pd) static int sh_mobile_i2c_r8a7740_workaround(struct sh_mobile_i2c_data *pd)
{ {
iic_set_clr(pd, ICCR, ICCR_ICE, 0); iic_set_clr(pd, ICCR, ICCR_ICE, 0);
iic_rd(pd, ICCR); /* dummy read */ iic_rd(pd, ICCR); /* dummy read */
@ -770,6 +770,8 @@ static void sh_mobile_i2c_r8a7740_workaround(struct sh_mobile_i2c_data *pd)
udelay(10); udelay(10);
iic_wr(pd, ICCR, ICCR_TRS); iic_wr(pd, ICCR, ICCR_TRS);
udelay(10); udelay(10);
return 0;
} }
static const struct sh_mobile_dt_config default_dt_config = { static const struct sh_mobile_dt_config default_dt_config = {
@ -881,8 +883,11 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
if (config) { if (config) {
pd->clks_per_count = config->clks_per_count; pd->clks_per_count = config->clks_per_count;
if (config->setup) if (config->setup) {
config->setup(pd); ret = config->setup(pd);
if (ret)
return ret;
}
} }
ret = sh_mobile_i2c_init(pd); ret = sh_mobile_i2c_init(pd);