[PATCH 12/13] usb/marvell: Remove conditional compilation of clk code
From: Viresh Kumar <hidden>
Date: 2012-04-21 11:59:38
Also in:
lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Viresh Kumar <hidden>
Date: 2012-04-21 11:59:38
Also in:
lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
With addition of dummy clk_*() calls for non CONFIG_HAVE_CLK cases in clk.h, there is no need to have clk code enclosed in #ifdef CONFIG_HAVE_CLK, #endif macros. Marvell usb also has these dummy macros defined locally. Remove them as they aren't required anymore. Signed-off-by: Viresh Kumar <redacted> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-usb at vger.kernel.org --- include/linux/platform_data/mv_usb.h | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/include/linux/platform_data/mv_usb.h b/include/linux/platform_data/mv_usb.h
index d94804a..944b01d 100644
--- a/include/linux/platform_data/mv_usb.h
+++ b/include/linux/platform_data/mv_usb.h@@ -52,13 +52,4 @@ struct mv_usb_platform_data { int (*set_vbus)(unsigned int vbus); int (*private_init)(void __iomem *opregs, void __iomem *phyregs); }; - -#ifndef CONFIG_HAVE_CLK -/* Dummy stub for clk framework */ -#define clk_get(dev, id) NULL -#define clk_put(clock) do {} while (0) -#define clk_enable(clock) do {} while (0) -#define clk_disable(clock) do {} while (0) -#endif - #endif
--
1.7.9