Commit 7041717e authored Jul 30, 2012 by Viresh Kumar Committed by Linus Torvalds Jul 30, 2012

arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n

mach-netx had its own implementation of clk routines like, clk_get{put},
clk_enable{disable}, etc.  And with introduction of following patchset:

  https://lkml.org/lkml/2012/4/24/154

we get compilation error for multiple definition of these routines.

Sascha had following suggestion to deal with it:

  http://www.spinics.net/lists/arm-kernel/msg179369.html



So, remove this code completely.

Signed-off-by: Viresh Kumar <viresh.kumar2@arm.com>
Reported-by: Paul Gortmaker <paul.gortmaker@gmail.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c311b78b

arch/arm/mach-netx/fb.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -69,29 +69,6 @@ void netx_clcd_remove(struct clcd_fb *fb)
		fb->fb.screen_base, fb->fb.fix.smem_start);
		}

		void clk_disable(struct clk *clk)
		{
		}

		int clk_set_rate(struct clk *clk, unsigned long rate)
		{
		return 0;
		}

		int clk_enable(struct clk *clk)
		{
		return 0;
		}

		struct clk clk_get(struct device dev, const char *id)
		{
		return dev && strcmp(dev_name(dev), "fb") == 0 ? NULL : ERR_PTR(-ENOENT);
		}

		void clk_put(struct clk *clk)
		{
		}

		static AMBA_AHB_DEVICE(fb, "fb", 0, 0x00104000, { NETX_IRQ_LCD }, NULL);

		int netx_fb_init(struct clcd_board board, struct clcd_panel panel)

Admin message