Commit 891b7023 authored by Jonathan Neuschäfer's avatar Jonathan Neuschäfer Committed by Stephen Boyd
Browse files

clk: mux: Declare u32 *table parameter as const 



The elements of the table are never modified in clk-mux.c. To make this
clear to clock drivers, declare the parameter as const u32 *table.

Signed-off-by: default avatarJonathan Neuschäfer <j.neuschaefer@gmx.net>
Link: https://lore.kernel.org/r/20220205103613.1216218-4-j.neuschaefer@gmx.net


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

drivers/clk/clk-mux.c

+5 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static inline void clk_mux_writel(struct clk_mux *mux, u32 val) 
		writel(val, mux->reg);

}



int clk_mux_val_to_index(struct clk_hw *hw, u32 *table, unsigned int flags,

int clk_mux_val_to_index(struct clk_hw *hw, const u32 *table, unsigned int flags,

			 unsigned int val)

{

	int num_parents = clk_hw_get_num_parents(hw);
@@ -67,7 +67,7 @@ int clk_mux_val_to_index(struct clk_hw *hw, u32 *table, unsigned int flags, 
}

EXPORT_SYMBOL_GPL(clk_mux_val_to_index);



unsigned int clk_mux_index_to_val(u32 *table, unsigned int flags, u8 index)

unsigned int clk_mux_index_to_val(const u32 *table, unsigned int flags, u8 index)

{

	unsigned int val = index;
@@ -152,7 +152,7 @@ struct clk_hw *__clk_hw_register_mux(struct device *dev, struct device_node *np, 
		const struct clk_hw **parent_hws,

		const struct clk_parent_data *parent_data,

		unsigned long flags, void __iomem *reg, u8 shift, u32 mask,

		u8 clk_mux_flags, u32 *table, spinlock_t *lock)

		u8 clk_mux_flags, const u32 *table, spinlock_t *lock)

{

	struct clk_mux *mux;

	struct clk_hw *hw;
@@ -218,7 +218,7 @@ struct clk_hw *__devm_clk_hw_register_mux(struct device *dev, struct device_node 
		const struct clk_hw **parent_hws,

		const struct clk_parent_data *parent_data,

		unsigned long flags, void __iomem *reg, u8 shift, u32 mask,

		u8 clk_mux_flags, u32 *table, spinlock_t *lock)

		u8 clk_mux_flags, const u32 *table, spinlock_t *lock)

{

	struct clk_hw **ptr, *hw;
@@ -244,7 +244,7 @@ EXPORT_SYMBOL_GPL(__devm_clk_hw_register_mux); 
struct clk *clk_register_mux_table(struct device *dev, const char *name,

		const char * const *parent_names, u8 num_parents,

		unsigned long flags, void __iomem *reg, u8 shift, u32 mask,

		u8 clk_mux_flags, u32 *table, spinlock_t *lock)

		u8 clk_mux_flags, const u32 *table, spinlock_t *lock)

{

	struct clk_hw *hw;

include/linux/clk-provider.h

+6 −6
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ void clk_hw_unregister_divider(struct clk_hw *hw); 
struct clk_mux {

	struct clk_hw	hw;

	void __iomem	*reg;

	u32		*table;

	const u32	*table;

	u32		mask;

	u8		shift;

	u8		flags;
@@ -913,18 +913,18 @@ struct clk_hw *__clk_hw_register_mux(struct device *dev, struct device_node *np, 
		const struct clk_hw **parent_hws,

		const struct clk_parent_data *parent_data,

		unsigned long flags, void __iomem *reg, u8 shift, u32 mask,

		u8 clk_mux_flags, u32 *table, spinlock_t *lock);

		u8 clk_mux_flags, const u32 *table, spinlock_t *lock);

struct clk_hw *__devm_clk_hw_register_mux(struct device *dev, struct device_node *np,

		const char *name, u8 num_parents,

		const char * const *parent_names,

		const struct clk_hw **parent_hws,

		const struct clk_parent_data *parent_data,

		unsigned long flags, void __iomem *reg, u8 shift, u32 mask,

		u8 clk_mux_flags, u32 *table, spinlock_t *lock);

		u8 clk_mux_flags, const u32 *table, spinlock_t *lock);

struct clk *clk_register_mux_table(struct device *dev, const char *name,

		const char * const *parent_names, u8 num_parents,

		unsigned long flags, void __iomem *reg, u8 shift, u32 mask,

		u8 clk_mux_flags, u32 *table, spinlock_t *lock);

		u8 clk_mux_flags, const u32 *table, spinlock_t *lock);



#define clk_register_mux(dev, name, parent_names, num_parents, flags, reg,    \

			 shift, width, clk_mux_flags, lock)		      \
@@ -962,9 +962,9 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name, 
			      (shift), BIT((width)) - 1, (clk_mux_flags),     \

			      NULL, (lock))



int clk_mux_val_to_index(struct clk_hw *hw, u32 *table, unsigned int flags,

int clk_mux_val_to_index(struct clk_hw *hw, const u32 *table, unsigned int flags,

			 unsigned int val);

unsigned int clk_mux_index_to_val(u32 *table, unsigned int flags, u8 index);

unsigned int clk_mux_index_to_val(const u32 *table, unsigned int flags, u8 index);



void clk_unregister_mux(struct clk *clk);

void clk_hw_unregister_mux(struct clk_hw *hw);