6 files changed, 5 insertions, 7 deletions

diff --git a/arch/sh/boards/board-apsh4a3a.c b/arch/sh/boards/board-apsh4a3a.c
index 8e2a27057bc9..2823619c6006 100644
--- a/arch/sh/boards/board-apsh4a3a.c
+++ b/arch/sh/boards/board-apsh4a3a.c
@@ -116,7 +116,7 @@ static int apsh4a3a_clk_init(void)
         int ret;
 
         clk = clk_get(NULL, "extal");
-        if (!clk || IS_ERR(clk))
+        if (IS_ERR(clk))
                 return PTR_ERR(clk);
         ret = clk_set_rate(clk, 33333000);
         clk_put(clk);
diff --git a/arch/sh/boards/board-apsh4ad0a.c b/arch/sh/boards/board-apsh4ad0a.c
index e2bd218a054e..b4d6292a9247 100644
--- a/arch/sh/boards/board-apsh4ad0a.c
+++ b/arch/sh/boards/board-apsh4ad0a.c
@@ -94,7 +94,7 @@ static int apsh4ad0a_clk_init(void)
         int ret;
 
         clk = clk_get(NULL, "extal");
-        if (!clk || IS_ERR(clk))
+        if (IS_ERR(clk))
                 return PTR_ERR(clk);
         ret = clk_set_rate(clk, 33333000);
         clk_put(clk);
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c
index ee65ff05c558..d879848f3cdd 100644
--- a/arch/sh/boards/board-sh7785lcr.c
+++ b/arch/sh/boards/board-sh7785lcr.c
@@ -299,7 +299,7 @@ static int sh7785lcr_clk_init(void)
         int ret;
 
         clk = clk_get(NULL, "extal");
-        if (!clk || IS_ERR(clk))
+        if (IS_ERR(clk))
                 return PTR_ERR(clk);
         ret = clk_set_rate(clk, 33333333);
         clk_put(clk);
diff --git a/arch/sh/boards/board-urquell.c b/arch/sh/boards/board-urquell.c
index d81c609decc7..24e3316c5c17 100644
--- a/arch/sh/boards/board-urquell.c
+++ b/arch/sh/boards/board-urquell.c
@@ -190,7 +190,7 @@ static int urquell_clk_init(void)
                 return -EINVAL;
 
         clk = clk_get(NULL, "extal");
-        if (!clk || IS_ERR(clk))
+        if (IS_ERR(clk))
                 return PTR_ERR(clk);
         ret = clk_set_rate(clk, 33333333);
         clk_put(clk);
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c
index 87618c91d178..74b8db1b74a9 100644
--- a/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@ -335,8 +335,6 @@ static struct clk *r7780rp_clocks[] = {
         &ivdr_clk,
 };
 
-#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
-
 static struct clk_lookup lookups[] = {
         /* main clocks */
         CLKDEV_CON_ID("ivdr_clk", &ivdr_clk),
diff --git a/arch/sh/boards/mach-sdk7786/setup.c b/arch/sh/boards/mach-sdk7786/setup.c
index 1521aa75ee3a..486d1ac3694c 100644
--- a/arch/sh/boards/mach-sdk7786/setup.c
+++ b/arch/sh/boards/mach-sdk7786/setup.c
@@ -194,7 +194,7 @@ static int sdk7786_clk_init(void)
                 return -EINVAL;
 
         clk = clk_get(NULL, "extal");
-        if (!clk || IS_ERR(clk))
+        if (IS_ERR(clk))
                 return PTR_ERR(clk);
         ret = clk_set_rate(clk, 33333333);
         clk_put(clk);