]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
i2c: mv64xxx: Remove useless test before clk_disable_unprepare
authorGregory CLEMENT <gregory.clement@free-electrons.com>
Tue, 16 Jan 2018 16:35:38 +0000 (17:35 +0100)
committerWolfram Sang <wsa@the-dreams.de>
Fri, 26 Jan 2018 17:49:45 +0000 (18:49 +0100)
clk_disable_unprepare() already checks that the clock pointer is valid.
No need to test it before calling it.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-mv64xxx.c

index a832c45276a42008a0b1a9ebeac00ffb8144a519..f69066266faa43dffa1acfbb31beaae633dfd1b1 100644 (file)
@@ -950,9 +950,7 @@ mv64xxx_i2c_probe(struct platform_device *pd)
 exit_reset:
        reset_control_assert(drv_data->rstc);
 exit_clk:
-       /* Not all platforms have a clk */
-       if (!IS_ERR(drv_data->clk))
-               clk_disable_unprepare(drv_data->clk);
+       clk_disable_unprepare(drv_data->clk);
 
        return rc;
 }
@@ -965,9 +963,7 @@ mv64xxx_i2c_remove(struct platform_device *dev)
        i2c_del_adapter(&drv_data->adapter);
        free_irq(drv_data->irq, drv_data);
        reset_control_assert(drv_data->rstc);
-       /* Not all platforms have a clk */
-       if (!IS_ERR(drv_data->clk))
-               clk_disable_unprepare(drv_data->clk);
+       clk_disable_unprepare(drv_data->clk);
 
        return 0;
 }