| Message ID | 20171208160640.13125-1-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello, On Fri, 8 Dec 2017 17:06:40 +0100, Thomas Petazzoni wrote: > The r8/r16/r32 wrappers around ioread8/ioread16/ioread32 take "const > void __iomem *" pointers, but ioread8/ioread16/ioread32 as defined in > <asm-generic/iomap.h> don't take const pointers. This causes a warning > when building cpg.c: > > CC net/ipv4/inet_fragment.o > drivers/sh/clk/cpg.c: In function ‘r8’: > drivers/sh/clk/cpg.c:41:17: warning: passing argument 1 of ‘ioread8’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] > return ioread8(addr); > ^~~~ > In file included from arch/sh/include/asm/io.h:21:0, > from include/linux/io.h:25, > from drivers/sh/clk/cpg.c:14: > include/asm-generic/iomap.h:29:21: note: expected ‘void *’ but argument is of type ‘const void *’ > extern unsigned int ioread8(void __iomem *); > ^~~~~~~ > drivers/sh/clk/cpg.c: In function ‘r16’: > drivers/sh/clk/cpg.c:46:18: warning: passing argument 1 of ‘ioread16’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] > return ioread16(addr); > ^~~~ > In file included from arch/sh/include/asm/io.h:21:0, > from include/linux/io.h:25, > from drivers/sh/clk/cpg.c:14: > include/asm-generic/iomap.h:30:21: note: expected ‘void *’ but argument is of type ‘const void *’ > extern unsigned int ioread16(void __iomem *); > ^~~~~~~~ > drivers/sh/clk/cpg.c: In function ‘r32’: > drivers/sh/clk/cpg.c:51:18: warning: passing argument 1 of ‘ioread32’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] > return ioread32(addr); > ^~~~ > In file included from arch/sh/include/asm/io.h:21:0, > from include/linux/io.h:25, > from drivers/sh/clk/cpg.c:14: > include/asm-generic/iomap.h:32:21: note: expected ‘void *’ but argument is of type ‘const void *’ > extern unsigned int ioread32(void __iomem *); > > To fix this, we simply drop the const qualifiers in the definitions of > r8/r16/r32. Changing the prototypes of ioread8/ioread16/ioread32 would > be a much bigger adventure. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> I've sent the patch almost 3 months ago, and it's a trivial patch. Is it possible to get some feedback, or alternatively, get this patch applied ? Thanks, Thomas
On Fri, Dec 8, 2017 at 5:06 PM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > The r8/r16/r32 wrappers around ioread8/ioread16/ioread32 take "const > void __iomem *" pointers, but ioread8/ioread16/ioread32 as defined in > <asm-generic/iomap.h> don't take const pointers. This causes a warning > when building cpg.c: > > CC net/ipv4/inet_fragment.o > drivers/sh/clk/cpg.c: In function ‘r8’: > drivers/sh/clk/cpg.c:41:17: warning: passing argument 1 of ‘ioread8’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] > return ioread8(addr); > ^~~~ > In file included from arch/sh/include/asm/io.h:21:0, > from include/linux/io.h:25, > from drivers/sh/clk/cpg.c:14: > include/asm-generic/iomap.h:29:21: note: expected ‘void *’ but argument is of type ‘const void *’ > extern unsigned int ioread8(void __iomem *); > ^~~~~~~ > drivers/sh/clk/cpg.c: In function ‘r16’: > drivers/sh/clk/cpg.c:46:18: warning: passing argument 1 of ‘ioread16’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] > return ioread16(addr); > ^~~~ > In file included from arch/sh/include/asm/io.h:21:0, > from include/linux/io.h:25, > from drivers/sh/clk/cpg.c:14: > include/asm-generic/iomap.h:30:21: note: expected ‘void *’ but argument is of type ‘const void *’ > extern unsigned int ioread16(void __iomem *); > ^~~~~~~~ > drivers/sh/clk/cpg.c: In function ‘r32’: > drivers/sh/clk/cpg.c:51:18: warning: passing argument 1 of ‘ioread32’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] > return ioread32(addr); > ^~~~ > In file included from arch/sh/include/asm/io.h:21:0, > from include/linux/io.h:25, > from drivers/sh/clk/cpg.c:14: > include/asm-generic/iomap.h:32:21: note: expected ‘void *’ but argument is of type ‘const void *’ > extern unsigned int ioread32(void __iomem *); > > To fix this, we simply drop the const qualifiers in the definitions of > r8/r16/r32. Changing the prototypes of ioread8/ioread16/ioread32 would > be a much bigger adventure. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Hmm: io.h and iomap.h seem to disagree: include/asm-generic/io.h:static inline u8 ioread8(const volatile void __iomem *addr) include/asm-generic/iomap.h:extern unsigned int ioread8(void __iomem *); > --- > drivers/sh/clk/cpg.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c > index 7442bc130055..87de622a0767 100644 > --- a/drivers/sh/clk/cpg.c > +++ b/drivers/sh/clk/cpg.c > @@ -36,17 +36,17 @@ static void sh_clk_write(int value, struct clk *clk) > iowrite32(value, clk->mapped_reg); > } > > -static unsigned int r8(const void __iomem *addr) > +static unsigned int r8(void __iomem *addr) > { > return ioread8(addr); > } > > -static unsigned int r16(const void __iomem *addr) > +static unsigned int r16(void __iomem *addr) > { > return ioread16(addr); > } > > -static unsigned int r32(const void __iomem *addr) > +static unsigned int r32(void __iomem *addr) > { > return ioread32(addr); > } > @@ -55,7 +55,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)(const void __iomem *addr); > + unsigned int (*read)(void __iomem *addr); > int i; > void __iomem *mapped_status = (phys_addr_t)clk->status_reg - > (phys_addr_t)clk->enable_reg + clk->mapped_reg; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c index 7442bc130055..87de622a0767 100644 --- a/drivers/sh/clk/cpg.c +++ b/drivers/sh/clk/cpg.c @@ -36,17 +36,17 @@ static void sh_clk_write(int value, struct clk *clk) iowrite32(value, clk->mapped_reg); } -static unsigned int r8(const void __iomem *addr) +static unsigned int r8(void __iomem *addr) { return ioread8(addr); } -static unsigned int r16(const void __iomem *addr) +static unsigned int r16(void __iomem *addr) { return ioread16(addr); } -static unsigned int r32(const void __iomem *addr) +static unsigned int r32(void __iomem *addr) { return ioread32(addr); } @@ -55,7 +55,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)(const void __iomem *addr); + unsigned int (*read)(void __iomem *addr); int i; void __iomem *mapped_status = (phys_addr_t)clk->status_reg - (phys_addr_t)clk->enable_reg + clk->mapped_reg;
The r8/r16/r32 wrappers around ioread8/ioread16/ioread32 take "const void __iomem *" pointers, but ioread8/ioread16/ioread32 as defined in <asm-generic/iomap.h> don't take const pointers. This causes a warning when building cpg.c: CC net/ipv4/inet_fragment.o drivers/sh/clk/cpg.c: In function ‘r8’: drivers/sh/clk/cpg.c:41:17: warning: passing argument 1 of ‘ioread8’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] return ioread8(addr); ^~~~ In file included from arch/sh/include/asm/io.h:21:0, from include/linux/io.h:25, from drivers/sh/clk/cpg.c:14: include/asm-generic/iomap.h:29:21: note: expected ‘void *’ but argument is of type ‘const void *’ extern unsigned int ioread8(void __iomem *); ^~~~~~~ drivers/sh/clk/cpg.c: In function ‘r16’: drivers/sh/clk/cpg.c:46:18: warning: passing argument 1 of ‘ioread16’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] return ioread16(addr); ^~~~ In file included from arch/sh/include/asm/io.h:21:0, from include/linux/io.h:25, from drivers/sh/clk/cpg.c:14: include/asm-generic/iomap.h:30:21: note: expected ‘void *’ but argument is of type ‘const void *’ extern unsigned int ioread16(void __iomem *); ^~~~~~~~ drivers/sh/clk/cpg.c: In function ‘r32’: drivers/sh/clk/cpg.c:51:18: warning: passing argument 1 of ‘ioread32’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] return ioread32(addr); ^~~~ In file included from arch/sh/include/asm/io.h:21:0, from include/linux/io.h:25, from drivers/sh/clk/cpg.c:14: include/asm-generic/iomap.h:32:21: note: expected ‘void *’ but argument is of type ‘const void *’ extern unsigned int ioread32(void __iomem *); To fix this, we simply drop the const qualifiers in the definitions of r8/r16/r32. Changing the prototypes of ioread8/ioread16/ioread32 would be a much bigger adventure. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- drivers/sh/clk/cpg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)