diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-01 19:56:28 +0300 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2017-02-01 12:22:21 +0300 |
| commit | ec671b5360b914fb3ad79053593d195996a95dde (patch) | |
| tree | b47b0f79ef09998c8ef74d52bd89ac01c983993d /drivers/remoteproc | |
| parent | 2099c77d4af7d1582db6d4437014cf18fe62e74b (diff) | |
| download | linux-ec671b5360b914fb3ad79053593d195996a95dde.tar.xz | |
remoteproc: qcom: fix initializers for qcom_mss_reg_res array
The recently added initialization is rather unusual because it uses a constructor for
a variable-length array to assign a constant structure to a member that uses a fixed-length
array. This confuses clang and breaks the build.
drivers/remoteproc/qcom_q6v5_pil.c:1024:18: error: incompatible pointer types initializing 'const char *' with an expression of type
:%s 'struct qcom_mss_reg_res [4]' [-Werror,-Wincompatible-pointer-types]
.proxy_supply = (struct qcom_mss_reg_res[]) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/remoteproc/qcom_q6v5_pil.c:1024:18: warning: suggest braces around initialization of subobject [-Wmissing-braces]
.proxy_supply = (struct qcom_mss_reg_res[]) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
We can either turn this constructor into a regular initializer by removing
the 'struct qcom_mss_reg_res[])', or we can make the array variable length.
The latter approach is used for the arrays of strings in the same structure,
so let's use that here too.
Fixes: 19f902b53b47 ("remoteproc: qcom: Initialize and enable proxy and active regulators.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/qcom_q6v5_pil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index 9a5149573298..8d60ad2a2851 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c @@ -107,8 +107,8 @@ struct qcom_mss_reg_res { struct rproc_hexagon_res { const char *hexagon_mba_image; - struct qcom_mss_reg_res proxy_supply[4]; - struct qcom_mss_reg_res active_supply[2]; + struct qcom_mss_reg_res *proxy_supply; + struct qcom_mss_reg_res *active_supply; char **proxy_clk_names; char **active_clk_names; }; |