Commit 570aaec7 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Stephen Boyd
Browse files

clk: Constify struct clk_bulk_data * where possible 



The following functions:

    - clk_bulk_enable()
    - clk_bulk_prepare()
    - clk_bulk_disable()
    - clk_bulk_unprepare()

already expect const clk_bulk_data * as a second parameter, however
their no-op version have mismatching prototypes that don't. Fix that.

While at it, constify the second argument of clk_bulk_prepare_enable()
and clk_bulk_disable_unprepare(), since the functions they are
comprised of already accept const clk_bulk_data *.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-clk@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Link: https://lkml.kernel.org/r/20190717145651.17250-1-andrew.smirnov@gmail.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 5f9e832c

include/linux/clk.h

+10 −7
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ static inline int clk_prepare(struct clk *clk) 
	return 0;

}



static inline int __must_check clk_bulk_prepare(int num_clks, struct clk_bulk_data *clks)

static inline int __must_check

clk_bulk_prepare(int num_clks, const struct clk_bulk_data *clks)

{

	might_sleep();

	return 0;
@@ -263,7 +264,8 @@ static inline void clk_unprepare(struct clk *clk) 
{

	might_sleep();

}

static inline void clk_bulk_unprepare(int num_clks, struct clk_bulk_data *clks)

static inline void clk_bulk_unprepare(int num_clks,

				      const struct clk_bulk_data *clks)

{

	might_sleep();

}
@@ -819,7 +821,8 @@ static inline int clk_enable(struct clk *clk) 
	return 0;

}



static inline int __must_check clk_bulk_enable(int num_clks, struct clk_bulk_data *clks)

static inline int __must_check clk_bulk_enable(int num_clks,

					       const struct clk_bulk_data *clks)

{

	return 0;

}
@@ -828,7 +831,7 @@ static inline void clk_disable(struct clk *clk) {} 




static inline void clk_bulk_disable(int num_clks,

				    struct clk_bulk_data *clks) {}

				    const struct clk_bulk_data *clks) {}



static inline unsigned long clk_get_rate(struct clk *clk)

{
@@ -917,8 +920,8 @@ static inline void clk_disable_unprepare(struct clk *clk) 
	clk_unprepare(clk);

}



static inline int __must_check clk_bulk_prepare_enable(int num_clks,

					struct clk_bulk_data *clks)

static inline int __must_check

clk_bulk_prepare_enable(int num_clks, const struct clk_bulk_data *clks)

{

	int ret;
@@ -933,7 +936,7 @@ static inline int __must_check clk_bulk_prepare_enable(int num_clks, 
}



static inline void clk_bulk_disable_unprepare(int num_clks,

					      struct clk_bulk_data *clks)

					      const struct clk_bulk_data *clks)

{

	clk_bulk_disable(num_clks, clks);

	clk_bulk_unprepare(num_clks, clks);

CRA Git | Maintained and supported by SUSTech CRA and CCSE