aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2018-01-16 11:35:38 -0500
committerWolfram Sang <wsa@the-dreams.de>2018-01-26 12:49:45 -0500
commita9e94bb80ea6d53745eb5ca86597696735565fb3 (patch)
treebd8d7e76ea84a4a5ca062d991d9f9a9e806d2b65
parent4be49b5d652e8b81ba8d019727ebd8cafd7ab4ac (diff)
i2c: mv64xxx: Remove useless test before clk_disable_unprepare
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>
-rw-r--r--drivers/i2c/busses/i2c-mv64xxx.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index a832c45276a4..f69066266faa 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -950,9 +950,7 @@ exit_free_irq:
950exit_reset: 950exit_reset:
951 reset_control_assert(drv_data->rstc); 951 reset_control_assert(drv_data->rstc);
952exit_clk: 952exit_clk:
953 /* Not all platforms have a clk */ 953 clk_disable_unprepare(drv_data->clk);
954 if (!IS_ERR(drv_data->clk))
955 clk_disable_unprepare(drv_data->clk);
956 954
957 return rc; 955 return rc;
958} 956}
@@ -965,9 +963,7 @@ mv64xxx_i2c_remove(struct platform_device *dev)
965 i2c_del_adapter(&drv_data->adapter); 963 i2c_del_adapter(&drv_data->adapter);
966 free_irq(drv_data->irq, drv_data); 964 free_irq(drv_data->irq, drv_data);
967 reset_control_assert(drv_data->rstc); 965 reset_control_assert(drv_data->rstc);
968 /* Not all platforms have a clk */ 966 clk_disable_unprepare(drv_data->clk);
969 if (!IS_ERR(drv_data->clk))
970 clk_disable_unprepare(drv_data->clk);
971 967
972 return 0; 968 return 0;
973} 969}