Commit 1df37992 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Stephen Boyd
Browse files

clk: consoldiate the __clk_get_hw() declarations 



Without this we were getting errors like:

In file included from drivers/clk/clkdev.c:22:0:
drivers/clk/clk.h:36:23: error: static declaration of '__clk_get_hw' follows non-static declaration
include/linux/clk-provider.h:808:16: note: previous declaration of '__clk_get_hw' was here

Fixes: 59fcdce4 ("clk: Remove ifdef for COMMON_CLK in clk-provider.h")
fixes: 73e0e496 ("clkdev: Always allocate a struct clk and call __clk_get() w/ CCF")
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 30d5a945

drivers/clk/clk.h

+0 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ clk_hw_create_clk(struct device *dev, struct clk_hw *hw, const char *dev_id, 
{

	return (struct clk *)hw;

}

static struct clk_hw *__clk_get_hw(struct clk *clk)

{

	return (struct clk_hw *)clk;

}

static inline void __clk_put(struct clk *clk) { }



#endif

drivers/clk/imx/clk-imx6q.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/types.h>

#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/of.h>

drivers/clk/imx/clk-imx6sll.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <dt-bindings/clock/imx6sll-clock.h>

#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/io.h>

drivers/clk/imx/clk-imx6sx.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <dt-bindings/clock/imx6sx-clock.h>

#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/io.h>

drivers/clk/imx/clk-imx6ul.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <dt-bindings/clock/imx6ul-clock.h>

#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/io.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE