mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-16 05:50:19 +00:00
usb/musb: remove conditional compilation of clk code
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. musb also has these dummy macros defined locally. Remove them as they aren't required anymore. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: Jeff Garzik <jgarzik@redhat.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Mike Turquette <mturquette@linaro.org> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: viresh kumar <viresh.linux@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
714904e1c3
commit
08aff53582
@ -81,14 +81,6 @@ struct musb_ep;
|
|||||||
#define is_peripheral_active(m) (!(m)->is_host)
|
#define is_peripheral_active(m) (!(m)->is_host)
|
||||||
#define is_host_active(m) ((m)->is_host)
|
#define is_host_active(m) ((m)->is_host)
|
||||||
|
|
||||||
#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
|
|
||||||
|
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#define MUSB_CONFIG_PROC_FS
|
#define MUSB_CONFIG_PROC_FS
|
||||||
|
Loading…
Reference in New Issue
Block a user