| Message ID | 20190807003037.48457-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 21b2920fb587e570b43973300a11b921c3a61d3e |
| Headers | show |
| Series | pinctrl: aspeed: g6: Remove const specifier from aspeed_g6_sig_expr_set's ctx parameter | expand |
On Wed, 7 Aug 2019, at 10:02, Nathan Chancellor wrote: > clang errors: > > drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c:2325:9: error: incompatible > pointer types initializing 'int (*)(struct aspeed_pinmux_data *, const > struct aspeed_sig_expr *, bool)' with an expression of type 'int (const > struct aspeed_pinmux_data *, const struct aspeed_sig_expr *, bool)' > [-Werror,-Wincompatible-pointer-types] > .set = aspeed_g6_sig_expr_set, > ^~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. > > Commit 674fa8daa8c9 ("pinctrl: aspeed-g5: Delay acquisition of regmaps") > changed the set function pointer declaration and the g6 one wasn't > updated (I assume because it wasn't merged yet). > > Fixes: 2eda1cdec49f ("pinctrl: aspeed: Add AST2600 pinmux support") > Link: https://github.com/ClangBuiltLinux/linux/issues/632 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> That's exactly what happened. Thanks. Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
On Wed, Aug 7, 2019 at 2:32 AM Nathan Chancellor <natechancellor@gmail.com> wrote: > clang errors: > > drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c:2325:9: error: incompatible > pointer types initializing 'int (*)(struct aspeed_pinmux_data *, const > struct aspeed_sig_expr *, bool)' with an expression of type 'int (const > struct aspeed_pinmux_data *, const struct aspeed_sig_expr *, bool)' > [-Werror,-Wincompatible-pointer-types] > .set = aspeed_g6_sig_expr_set, > ^~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. > > Commit 674fa8daa8c9 ("pinctrl: aspeed-g5: Delay acquisition of regmaps") > changed the set function pointer declaration and the g6 one wasn't > updated (I assume because it wasn't merged yet). > > Fixes: 2eda1cdec49f ("pinctrl: aspeed: Add AST2600 pinmux support") > Link: https://github.com/ClangBuiltLinux/linux/issues/632 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Patch applied with Andrew's ACK. Yours, Linus Walleij
On Sat, 10 Aug 2019, at 17:43, Linus Walleij wrote: > On Wed, Aug 7, 2019 at 2:32 AM Nathan Chancellor > <natechancellor@gmail.com> wrote: > > > clang errors: > > > > drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c:2325:9: error: incompatible > > pointer types initializing 'int (*)(struct aspeed_pinmux_data *, const > > struct aspeed_sig_expr *, bool)' with an expression of type 'int (const > > struct aspeed_pinmux_data *, const struct aspeed_sig_expr *, bool)' > > [-Werror,-Wincompatible-pointer-types] > > .set = aspeed_g6_sig_expr_set, > > ^~~~~~~~~~~~~~~~~~~~~~ > > 1 error generated. > > > > Commit 674fa8daa8c9 ("pinctrl: aspeed-g5: Delay acquisition of regmaps") > > changed the set function pointer declaration and the g6 one wasn't > > updated (I assume because it wasn't merged yet). > > > > Fixes: 2eda1cdec49f ("pinctrl: aspeed: Add AST2600 pinmux support") > > Link: https://github.com/ClangBuiltLinux/linux/issues/632 > > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > > Patch applied with Andrew's ACK. FYI this fixes pinctrl/for-next which is likely where Nathan ran into the issue, however to fix pinctrl/devel we'll need a back-merge of pinctrl/fixes, or to apply 674fa8daa8c9 ("pinctrl: aspeed-g5: Delay acquisition of regmaps") to pinctrl/devel also. Fixing that bug was unfortunate timing wrt the 2600 driver. Andrew
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c index 6012d7d4a22a..648ddb7f038a 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c @@ -2267,7 +2267,7 @@ static const struct aspeed_pin_function aspeed_g6_functions[] = { * Return: 0 if the expression is configured as requested and a negative error * code otherwise */ -static int aspeed_g6_sig_expr_set(const struct aspeed_pinmux_data *ctx, +static int aspeed_g6_sig_expr_set(struct aspeed_pinmux_data *ctx, const struct aspeed_sig_expr *expr, bool enable) {
clang errors: drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c:2325:9: error: incompatible pointer types initializing 'int (*)(struct aspeed_pinmux_data *, const struct aspeed_sig_expr *, bool)' with an expression of type 'int (const struct aspeed_pinmux_data *, const struct aspeed_sig_expr *, bool)' [-Werror,-Wincompatible-pointer-types] .set = aspeed_g6_sig_expr_set, ^~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Commit 674fa8daa8c9 ("pinctrl: aspeed-g5: Delay acquisition of regmaps") changed the set function pointer declaration and the g6 one wasn't updated (I assume because it wasn't merged yet). Fixes: 2eda1cdec49f ("pinctrl: aspeed: Add AST2600 pinmux support") Link: https://github.com/ClangBuiltLinux/linux/issues/632 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)