Re: [PATCH] sh: clk: Fix assignment from incompatible pointer type for ioreadX()

[Krzysztof Kozlowski <krzk@kernel.org>]

On Thu, Jul 23, 2020 at 02:49:46PM +0200, John Paul Adrian Glaubitz wrote:
> Hi Krzysztof!
> 
> On 7/23/20 10:20 AM, Krzysztof Kozlowski wrote:
> > Maybe because it depends on commit 58c4d8659186 ("sh: clkfwk: remove
> > r8/r16/r32") which landed later?  Anyway it should go through your tree,
> > I think.
> > ---
> >  drivers/sh/clk/cpg.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c
> > index a5cacfe24a42..fd72d9088bdc 100644
> > --- a/drivers/sh/clk/cpg.c
> > +++ b/drivers/sh/clk/cpg.c
> > @@ -40,7 +40,7 @@ static int sh_clk_mstp_enable(struct clk *clk)
> >  {
> >  	sh_clk_write(sh_clk_read(clk) & ~(1 << clk->enable_bit), clk);
> >  	if (clk->status_reg) {
> > -		unsigned int (*read)(void __iomem *addr);
> > +		unsigned int (*read)(const void __iomem *addr);
> >  		int i;
> >  		void __iomem *mapped_status = (phys_addr_t)clk->status_reg -
> >  			(phys_addr_t)clk->enable_reg + clk->mapped_reg;
> 
> Is that a reverted patch, by any chance? The patch does not apply for me and looking at
> the sources, the qualifier is already "const" [1].

The patch is for Andrew Morton's tree which contain two commits:
1. sh: clkfwk: remove r8/r16/r32
2. iomap: constify ioreadX() iomem argument (as in generic implementation)

This patch here was actually part of #2 because of being based on
linux-next. However it disappeared when applying to Andrew's tree
because patch #1 came later.

Best regards,
Krzysztof