| Message ID | 20200310211514.32288-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e1833b9e0d728fc731cd1e9449af185ebf2877da |
| Headers | show |
| Series | remoteproc/mediatek: Use size_t type for len in scp_da_to_va | expand |
On Tue 10 Mar 14:15 PDT 2020, Nathan Chancellor wrote: > Clang errors: > > drivers/remoteproc/mtk_scp.c:364:14: error: incompatible function > pointer types initializing 'void *(*)(struct rproc *, u64, size_t)' (aka > 'void *(*)(struct rproc *, unsigned long long, unsigned int)') with an > expression of type 'void *(struct rproc *, u64, int)' (aka 'void > *(struct rproc *, unsigned long long, int)') > [-Werror,-Wincompatible-function-pointer-types] > .da_to_va = scp_da_to_va, > ^~~~~~~~~~~~ > 1 error generated. > > Make the same change as commit 0fcbb369f052 ("remoteproc: Use size_t > type for len in da_to_va"), which was not updated for the acceptance of > commit 63c13d61eafe ("remoteproc/mediatek: add SCP support for mt8183"). > > Fixes: 0fcbb369f052 ("remoteproc: Use size_t type for len in da_to_va") > Link: https://github.com/ClangBuiltLinux/linux/issues/927 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Applied, thank you. Regards, Bjorn > --- > drivers/remoteproc/mtk_scp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > index 7ccdf64ff3ea..ea3743e7e794 100644 > --- a/drivers/remoteproc/mtk_scp.c > +++ b/drivers/remoteproc/mtk_scp.c > @@ -320,7 +320,7 @@ static int scp_start(struct rproc *rproc) > return ret; > } > > -static void *scp_da_to_va(struct rproc *rproc, u64 da, int len) > +static void *scp_da_to_va(struct rproc *rproc, u64 da, size_t len) > { > struct mtk_scp *scp = (struct mtk_scp *)rproc->priv; > int offset; > -- > 2.26.0.rc1 >
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index 7ccdf64ff3ea..ea3743e7e794 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -320,7 +320,7 @@ static int scp_start(struct rproc *rproc) return ret; } -static void *scp_da_to_va(struct rproc *rproc, u64 da, int len) +static void *scp_da_to_va(struct rproc *rproc, u64 da, size_t len) { struct mtk_scp *scp = (struct mtk_scp *)rproc->priv; int offset;
Clang errors: drivers/remoteproc/mtk_scp.c:364:14: error: incompatible function pointer types initializing 'void *(*)(struct rproc *, u64, size_t)' (aka 'void *(*)(struct rproc *, unsigned long long, unsigned int)') with an expression of type 'void *(struct rproc *, u64, int)' (aka 'void *(struct rproc *, unsigned long long, int)') [-Werror,-Wincompatible-function-pointer-types] .da_to_va = scp_da_to_va, ^~~~~~~~~~~~ 1 error generated. Make the same change as commit 0fcbb369f052 ("remoteproc: Use size_t type for len in da_to_va"), which was not updated for the acceptance of commit 63c13d61eafe ("remoteproc/mediatek: add SCP support for mt8183"). Fixes: 0fcbb369f052 ("remoteproc: Use size_t type for len in da_to_va") Link: https://github.com/ClangBuiltLinux/linux/issues/927 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/remoteproc/mtk_scp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)