The patch titled
Subject: sh: clk: fix assignment from incompatible pointer type for ioreadX()
has been removed from the -mm tree. Its filename was
iomap-constify-ioreadx-iomem-argument-as-in-generic-implementation-fix.patch
This patch was dropped because it was folded into iomap-constify-ioreadx-iomem-argument-as-in-generic-implementation.patch
------------------------------------------------------
From: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
Subject: sh: clk: fix assignment from incompatible pointer type for ioreadX()
The ioreadX() helpers accept now pointer to const memory so declaration
of read function needs updating.
This fixes build errors like:
drivers/sh/clk/cpg.c: In function `sh_clk_mstp_enable':
drivers/sh/clk/cpg.c:49:9: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types]
read = ioread8;
Link: http://lkml.kernel.org/r/20200723082017.24053-1-krzk@xxxxxxxxxx
Signed-off-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
Cc: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Cc: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
Cc: Rich Felker <dalias@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/sh/clk/cpg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/sh/clk/cpg.c~iomap-constify-ioreadx-iomem-argument-as-in-generic-implementation-fix
+++ a/drivers/sh/clk/cpg.c
@@ -40,7 +40,7 @@ static int sh_clk_mstp_enable(struct 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;
_
Patches currently in -mm which might be from krzk@xxxxxxxxxx are
iomap-constify-ioreadx-iomem-argument-as-in-generic-implementation.patch
rtl818x-constify-ioreadx-iomem-argument-as-in-generic-implementation.patch
ntb-intel-constify-ioreadx-iomem-argument-as-in-generic-implementation.patch
virtio-pci-constify-ioreadx-iomem-argument-as-in-generic-implementation.patch
