From: Krzysztof Kozlowski <krzk@kernel.org>
To: Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH] sh: clk: Fix assignment from incompatible pointer type for ioreadX()
Date: Thu, 23 Jul 2020 08:20:17 +0000
Message-ID: <20200723082017.24053-1-krzk@kernel.org> (raw)
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;
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
Dear Andrew,
This was part of my v3 patchset commit 9ab7fb303cc1 ("iomap: Constify
ioreadX() iomem argument (as in generic implementation)") but I think it
was skipped when applying to your tree.
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;
--
2.17.1
next reply index
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 8:20 Krzysztof Kozlowski [this message]
2020-07-23 12:49 ` John Paul Adrian Glaubitz
2020-07-23 12:57 ` Krzysztof Kozlowski
2020-07-23 13:14 ` John Paul Adrian Glaubitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200723082017.24053-1-krzk@kernel.org \
--to=krzk@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=dalias@libc.org \
--cc=geert+renesas@glider.be \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Linux-sh Archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/linux-sh/0 linux-sh/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 linux-sh linux-sh/ https://lore.kernel.org/linux-sh \
linux-sh@vger.kernel.org
public-inbox-index linux-sh
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.linux-sh
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git