p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i2c: sh_mobile: drop needless check for of_node 

After removal of platform_data support, we can simplify OF handling.
of_match_device() evaluates to NULL if !CONFIG_OF or if there is no node
pointer for that device, so we can remove the check for the node ptr.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2017-05-18 23:11:40 +02:00 committed by Wolfram Sang
parent d2f31c49cf
commit 90b84c0574
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -881,6 +881,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
struct sh_mobile_i2c_data *pd; struct sh_mobile_i2c_data *pd;
struct i2c_adapter *adap; struct i2c_adapter *adap;
struct resource *res; struct resource *res;
const struct of_device_id *match;
int ret; int ret;
u32 bus_speed; u32 bus_speed;
@ -910,23 +911,17 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
ret = of_property_read_u32(dev->dev.of_node, "clock-frequency", &bus_speed); ret = of_property_read_u32(dev->dev.of_node, "clock-frequency", &bus_speed);
pd->bus_speed = ret ? STANDARD_MODE : bus_speed; pd->bus_speed = ret ? STANDARD_MODE : bus_speed;
pd->clks_per_count = 1; pd->clks_per_count = 1;
if (dev->dev.of_node) {
const struct of_device_id *match;
match = of_match_device(sh_mobile_i2c_dt_ids, &dev->dev); match = of_match_device(sh_mobile_i2c_dt_ids, &dev->dev);
if (match) { if (match) {
const struct sh_mobile_dt_config *config; const struct sh_mobile_dt_config *config = match->data;
config = match->data;
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); config->setup(pd);
} }
}
/* The IIC blocks on SH-Mobile ARM processors /* The IIC blocks on SH-Mobile ARM processors
* come with two new bits in ICIC. * come with two new bits in ICIC.