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

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

i2c/i2c-pxa: 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.

pxa i2c 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 avatarWolfram Sang <w.sang@pengutronix.de>
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 01da40bf

drivers/i2c/busses/i2c-pxa.c

+0 −7
Original line number Diff line number Diff line
@@ -41,13 +41,6 @@ 


#include <asm/irq.h>



#ifndef CONFIG_HAVE_CLK

#define clk_get(dev, id)	NULL

#define clk_put(clk)		do { } while (0)

#define clk_disable(clk)	do { } while (0)

#define clk_enable(clk)		do { } while (0)

#endif



struct pxa_reg_layout {

	u32 ibmr;

	u32 idbr;