]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
i2c: sh_mobile: drop needless check for of_node
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Thu, 18 May 2017 21:11:40 +0000 (23:11 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Fri, 2 Jun 2017 20:52:51 +0000 (22:52 +0200)
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>
drivers/i2c/busses/i2c-sh_mobile.c

index d5e39eccae9b972d76bf61e42b8637cefd4a7dae..2e097d97d258bc67ee799ccef7255ad3872361a1 100644 (file)
@@ -881,6 +881,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
        struct sh_mobile_i2c_data *pd;
        struct i2c_adapter *adap;
        struct resource *res;
+       const struct of_device_id *match;
        int ret;
        u32 bus_speed;
 
@@ -910,22 +911,16 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
 
        ret = of_property_read_u32(dev->dev.of_node, "clock-frequency", &bus_speed);
        pd->bus_speed = ret ? STANDARD_MODE : bus_speed;
-
        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);
-               if (match) {
-                       const struct sh_mobile_dt_config *config;
+       match = of_match_device(sh_mobile_i2c_dt_ids, &dev->dev);
+       if (match) {
+               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)
-                               config->setup(pd);
-               }
+               if (config->setup)
+                       config->setup(pd);
        }
 
        /* The IIC blocks on SH-Mobile ARM processors