mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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: 19f902b53b
("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>
This commit is contained in:
parent
2099c77d4a
commit
ec671b5360
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue