1 files changed, 13 insertions, 15 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 96814fb67155..ece0125a1ee5 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -193,22 +193,24 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
 
 static int __init omap_i2c_get_clocks(struct omap_i2c_dev *dev)
 {
-        if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
-                dev->iclk = clk_get(dev->dev, "ick");
-                if (IS_ERR(dev->iclk)) {
-                        dev->iclk = NULL;
-                        return -ENODEV;
-                }
+        int ret;
+
+        dev->iclk = clk_get(dev->dev, "ick");
+        if (IS_ERR(dev->iclk)) {
+                ret = PTR_ERR(dev->iclk);
+                dev->iclk = NULL;
+                return ret;
         }
 
         dev->fclk = clk_get(dev->dev, "fck");
         if (IS_ERR(dev->fclk)) {
+                ret = PTR_ERR(dev->fclk);
                 if (dev->iclk != NULL) {
                         clk_put(dev->iclk);
                         dev->iclk = NULL;
                 }
                 dev->fclk = NULL;
-                return -ENODEV;
+                return ret;
         }
 
         return 0;
@@ -218,18 +220,15 @@ static void omap_i2c_put_clocks(struct omap_i2c_dev *dev)
 {
         clk_put(dev->fclk);
         dev->fclk = NULL;
-        if (dev->iclk != NULL) {
-                clk_put(dev->iclk);
-                dev->iclk = NULL;
-        }
+        clk_put(dev->iclk);
+        dev->iclk = NULL;
 }
 
 static void omap_i2c_unidle(struct omap_i2c_dev *dev)
 {
         WARN_ON(!dev->idle);
 
-        if (dev->iclk != NULL)
-                clk_enable(dev->iclk);
+        clk_enable(dev->iclk);
         clk_enable(dev->fclk);
         dev->idle = 0;
         if (dev->iestate)
@@ -254,8 +253,7 @@ static void omap_i2c_idle(struct omap_i2c_dev *dev)
         }
         dev->idle = 1;
         clk_disable(dev->fclk);
-        if (dev->iclk != NULL)
-                clk_disable(dev->iclk);
+        clk_disable(dev->iclk);
 }
 
 static int omap_i2c_init(struct omap_i2c_dev *dev)