Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08aff535 authored by Viresh Kumar's avatar Viresh Kumar Committed by Linus Torvalds
Browse files

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: default avatarViresh Kumar <viresh.kumar@st.com>
Acked-by: default avatarJeff 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 714904e1

drivers/usb/musb/musb_core.h

+0 −8
Original line number Diff line number Diff line
@@ -81,14 +81,6 @@ struct musb_ep; 
#define is_peripheral_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

#include <linux/fs.h>

#define MUSB_CONFIG_PROC_FS