Commit 5834fd75 authored by Jonas Gorski's avatar Jonas Gorski Committed by Stephen Boyd
Browse files

clk: core: replace clk_{readl,writel} with {readl,writel} 



Now that clk_{readl,writel} is just an alias for {readl,writel}, we can
switch all users of clk_* to use the accessors directly and remove the
helpers.

Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
[sboyd@kernel.org: Also convert renesas file so that this can be
compile independently]
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent f1224987

drivers/clk/clk-divider.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static inline u32 clk_div_readl(struct clk_divider *divider) 
	if (divider->flags & CLK_DIVIDER_BIG_ENDIAN)

		return ioread32be(divider->reg);



	return clk_readl(divider->reg);

	return readl(divider->reg);

}



static inline void clk_div_writel(struct clk_divider *divider, u32 val)
@@ -38,7 +38,7 @@ static inline void clk_div_writel(struct clk_divider *divider, u32 val) 
	if (divider->flags & CLK_DIVIDER_BIG_ENDIAN)

		iowrite32be(val, divider->reg);

	else

		clk_writel(val, divider->reg);

		writel(val, divider->reg);

}



static unsigned int _get_table_maxdiv(const struct clk_div_table *table,

drivers/clk/clk-fractional-divider.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static inline u32 clk_fd_readl(struct clk_fractional_divider *fd) 
	if (fd->flags & CLK_FRAC_DIVIDER_BIG_ENDIAN)

		return ioread32be(fd->reg);



	return clk_readl(fd->reg);

	return readl(fd->reg);

}



static inline void clk_fd_writel(struct clk_fractional_divider *fd, u32 val)
@@ -26,7 +26,7 @@ static inline void clk_fd_writel(struct clk_fractional_divider *fd, u32 val) 
	if (fd->flags & CLK_FRAC_DIVIDER_BIG_ENDIAN)

		iowrite32be(val, fd->reg);

	else

		clk_writel(val, fd->reg);

		writel(val, fd->reg);

}



static unsigned long clk_fd_recalc_rate(struct clk_hw *hw,

drivers/clk/clk-gate.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static inline u32 clk_gate_readl(struct clk_gate *gate) 
	if (gate->flags & CLK_GATE_BIG_ENDIAN)

		return ioread32be(gate->reg);



	return clk_readl(gate->reg);

	return readl(gate->reg);

}



static inline void clk_gate_writel(struct clk_gate *gate, u32 val)
@@ -36,7 +36,7 @@ static inline void clk_gate_writel(struct clk_gate *gate, u32 val) 
	if (gate->flags & CLK_GATE_BIG_ENDIAN)

		iowrite32be(val, gate->reg);

	else

		clk_writel(val, gate->reg);

		writel(val, gate->reg);

}



/*

drivers/clk/clk-multiplier.c

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static inline u32 clk_mult_readl(struct clk_multiplier *mult) 
	if (mult->flags & CLK_MULTIPLIER_BIG_ENDIAN)

		return ioread32be(mult->reg);



	return clk_readl(mult->reg);

	return readl(mult->reg);

}



static inline void clk_mult_writel(struct clk_multiplier *mult, u32 val)
@@ -24,7 +24,7 @@ static inline void clk_mult_writel(struct clk_multiplier *mult, u32 val) 
	if (mult->flags & CLK_MULTIPLIER_BIG_ENDIAN)

		iowrite32be(val, mult->reg);

	else

		clk_writel(val, mult->reg);

		writel(val, mult->reg);

}



static unsigned long __get_mult(struct clk_multiplier *mult,

drivers/clk/clk-mux.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static inline u32 clk_mux_readl(struct clk_mux *mux) 
	if (mux->flags & CLK_MUX_BIG_ENDIAN)

		return ioread32be(mux->reg);



	return clk_readl(mux->reg);

	return readl(mux->reg);

}



static inline void clk_mux_writel(struct clk_mux *mux, u32 val)
@@ -36,7 +36,7 @@ static inline void clk_mux_writel(struct clk_mux *mux, u32 val) 
	if (mux->flags & CLK_MUX_BIG_ENDIAN)

		iowrite32be(val, mux->reg);

	else

		clk_writel(val, mux->reg);

		writel(val, mux->reg);

}



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE