2020-04-29 10:21:29

by Georgi Djakov

Subject: [PATCH 1/1] interconnect: qcom: Move the static keyword to the front of declaration

From: ChenTao <[email protected]>

Fix the following warning:

Move the static keyword to the front of declaration of sdm845_icc_osm_l3
sdm845_aggre1_noc sc7180_icc_osm_l3 sdm845_aggre2_noc sdm845_config_noc
sdm845_dc_noc sdm845_gladiator_noc sdm845_mem_noc sdm845_mmss_noc and
sdm845_system_noc, resolve the following compiler warning that can be
when building with warnings enabled (W=1):

drivers/interconnect/qcom/osm-l3.c:81:1: warning:
const static struct qcom_icc_desc sdm845_icc_osm_l3 = {
drivers/interconnect/qcom/osm-l3.c:94:1: warning:
const static struct qcom_icc_desc sc7180_icc_osm_l3 = {
drivers/interconnect/qcom/sdm845.c:195:1: warning:
const static struct qcom_icc_desc sdm845_aggre1_noc = {
drivers/interconnect/qcom/sdm845.c:223:1: warning:
const static struct qcom_icc_desc sdm845_aggre2_noc = {
drivers/interconnect/qcom/sdm845.c:284:1: warning:
const static struct qcom_icc_desc sdm845_config_noc = {
drivers/interconnect/qcom/sdm845.c:300:1: warning:
const static struct qcom_icc_desc sdm845_dc_noc = {
drivers/interconnect/qcom/sdm845.c:318:1: warning:
const static struct qcom_icc_desc sdm845_gladiator_noc = {
drivers/interconnect/qcom/sdm845.c:353:1: warning:
const static struct qcom_icc_desc sdm845_mem_noc = {
drivers/interconnect/qcom/sdm845.c:387:1: warning:
const static struct qcom_icc_desc sdm845_mmss_noc = {
drivers/interconnect/qcom/sdm845.c:433:1: warning:
const static struct qcom_icc_desc sdm845_system_noc = {

Reported-by: Hulk Robot <[email protected]>
Signed-off-by: ChenTao <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Georgi Djakov <[email protected]>
---
drivers/interconnect/qcom/osm-l3.c | 4 ++--
drivers/interconnect/qcom/sdm845.c | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/interconnect/qcom/osm-l3.c b/drivers/interconnect/qcom/osm-l3.c
index a03c6d6833df..96fb9ff5ff2e 100644
--- a/drivers/interconnect/qcom/osm-l3.c
+++ b/drivers/interconnect/qcom/osm-l3.c
@@ -78,7 +78,7 @@ static struct qcom_icc_node *sdm845_osm_l3_nodes[] = {
[SLAVE_OSM_L3] = &sdm845_osm_l3,
};

-const static struct qcom_icc_desc sdm845_icc_osm_l3 = {
+static const struct qcom_icc_desc sdm845_icc_osm_l3 = {
.nodes = sdm845_osm_l3_nodes,
.num_nodes = ARRAY_SIZE(sdm845_osm_l3_nodes),
};
@@ -91,7 +91,7 @@ static struct qcom_icc_node *sc7180_osm_l3_nodes[] = {
[SLAVE_OSM_L3] = &sc7180_osm_l3,
};

-const static struct qcom_icc_desc sc7180_icc_osm_l3 = {
+static const struct qcom_icc_desc sc7180_icc_osm_l3 = {
.nodes = sc7180_osm_l3_nodes,
.num_nodes = ARRAY_SIZE(sc7180_osm_l3_nodes),
};
diff --git a/drivers/interconnect/qcom/sdm845.c b/drivers/interconnect/qcom/sdm845.c
index b013b80caa45..f6c7b969520d 100644
--- a/drivers/interconnect/qcom/sdm845.c
+++ b/drivers/interconnect/qcom/sdm845.c
@@ -192,7 +192,7 @@ static struct qcom_icc_node *aggre1_noc_nodes[] = {
[SLAVE_ANOC_PCIE_A1NOC_SNOC] = &qns_pcie_a1noc_snoc,
};

-const static struct qcom_icc_desc sdm845_aggre1_noc = {
+static const struct qcom_icc_desc sdm845_aggre1_noc = {
.nodes = aggre1_noc_nodes,
.num_nodes = ARRAY_SIZE(aggre1_noc_nodes),
.bcms = aggre1_noc_bcms,
@@ -220,7 +220,7 @@ static struct qcom_icc_node *aggre2_noc_nodes[] = {
[SLAVE_SERVICE_A2NOC] = &srvc_aggre2_noc,
};

-const static struct qcom_icc_desc sdm845_aggre2_noc = {
+static const struct qcom_icc_desc sdm845_aggre2_noc = {
.nodes = aggre2_noc_nodes,
.num_nodes = ARRAY_SIZE(aggre2_noc_nodes),
.bcms = aggre2_noc_bcms,
@@ -281,7 +281,7 @@ static struct qcom_icc_node *config_noc_nodes[] = {
[SLAVE_SERVICE_CNOC] = &srvc_cnoc,
};

-const static struct qcom_icc_desc sdm845_config_noc = {
+static const struct qcom_icc_desc sdm845_config_noc = {
.nodes = config_noc_nodes,
.num_nodes = ARRAY_SIZE(config_noc_nodes),
.bcms = config_noc_bcms,
@@ -297,7 +297,7 @@ static struct qcom_icc_node *dc_noc_nodes[] = {
[SLAVE_MEM_NOC_CFG] = &qhs_memnoc,
};

-const static struct qcom_icc_desc sdm845_dc_noc = {
+static const struct qcom_icc_desc sdm845_dc_noc = {
.nodes = dc_noc_nodes,
.num_nodes = ARRAY_SIZE(dc_noc_nodes),
.bcms = dc_noc_bcms,
@@ -315,7 +315,7 @@ static struct qcom_icc_node *gladiator_noc_nodes[] = {
[SLAVE_SERVICE_GNOC] = &srvc_gnoc,
};

-const static struct qcom_icc_desc sdm845_gladiator_noc = {
+static const struct qcom_icc_desc sdm845_gladiator_noc = {
.nodes = gladiator_noc_nodes,
.num_nodes = ARRAY_SIZE(gladiator_noc_nodes),
.bcms = gladiator_noc_bcms,
@@ -350,7 +350,7 @@ static struct qcom_icc_node *mem_noc_nodes[] = {
[SLAVE_EBI1] = &ebi,
};

-const static struct qcom_icc_desc sdm845_mem_noc = {
+static const struct qcom_icc_desc sdm845_mem_noc = {
.nodes = mem_noc_nodes,
.num_nodes = ARRAY_SIZE(mem_noc_nodes),
.bcms = mem_noc_bcms,
@@ -384,7 +384,7 @@ static struct qcom_icc_node *mmss_noc_nodes[] = {
[SLAVE_CAMNOC_UNCOMP] = &qns_camnoc_uncomp,
};

-const static struct qcom_icc_desc sdm845_mmss_noc = {
+static const struct qcom_icc_desc sdm845_mmss_noc = {
.nodes = mmss_noc_nodes,
.num_nodes = ARRAY_SIZE(mmss_noc_nodes),
.bcms = mmss_noc_bcms,
@@ -430,7 +430,7 @@ static struct qcom_icc_node *system_noc_nodes[] = {
[SLAVE_TCU] = &xs_sys_tcu_cfg,
};

-const static struct qcom_icc_desc sdm845_system_noc = {
+static const struct qcom_icc_desc sdm845_system_noc = {
.nodes = system_noc_nodes,
.num_nodes = ARRAY_SIZE(system_noc_nodes),
.bcms = system_noc_bcms,

2020-04-29 12:09:47

by Chen Tao

Subject: Re: [PATCH 1/1] interconnect: qcom: Move the static keyword to the front of declaration

Thank you for your review and modification!

On 2020/4/29 18:19, Georgi Djakov wrote:
> From: ChenTao <[email protected]>
>
> Fix the following warning:
>
> Move the static keyword to the front of declaration of sdm845_icc_osm_l3
> sdm845_aggre1_noc sc7180_icc_osm_l3 sdm845_aggre2_noc sdm845_config_noc
> sdm845_dc_noc sdm845_gladiator_noc sdm845_mem_noc sdm845_mmss_noc and
> sdm845_system_noc, resolve the following compiler warning that can be
> when building with warnings enabled (W=1):
>
> drivers/interconnect/qcom/osm-l3.c:81:1: warning:
> const static struct qcom_icc_desc sdm845_icc_osm_l3 = {
> drivers/interconnect/qcom/osm-l3.c:94:1: warning:
> const static struct qcom_icc_desc sc7180_icc_osm_l3 = {
> drivers/interconnect/qcom/sdm845.c:195:1: warning:
> const static struct qcom_icc_desc sdm845_aggre1_noc = {
> drivers/interconnect/qcom/sdm845.c:223:1: warning:
> const static struct qcom_icc_desc sdm845_aggre2_noc = {
> drivers/interconnect/qcom/sdm845.c:284:1: warning:
> const static struct qcom_icc_desc sdm845_config_noc = {
> drivers/interconnect/qcom/sdm845.c:300:1: warning:
> const static struct qcom_icc_desc sdm845_dc_noc = {
> drivers/interconnect/qcom/sdm845.c:318:1: warning:
> const static struct qcom_icc_desc sdm845_gladiator_noc = {
> drivers/interconnect/qcom/sdm845.c:353:1: warning:
> const static struct qcom_icc_desc sdm845_mem_noc = {
> drivers/interconnect/qcom/sdm845.c:387:1: warning:
> const static struct qcom_icc_desc sdm845_mmss_noc = {
> drivers/interconnect/qcom/sdm845.c:433:1: warning:
> const static struct qcom_icc_desc sdm845_system_noc = {
>
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: ChenTao <[email protected]>
> Link: https://lore.kernel.org/r/[email protected]
> Signed-off-by: Georgi Djakov <[email protected]>
> ---
> drivers/interconnect/qcom/osm-l3.c | 4 ++--
> drivers/interconnect/qcom/sdm845.c | 16 ++++++++--------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/interconnect/qcom/osm-l3.c b/drivers/interconnect/qcom/osm-l3.c
> index a03c6d6833df..96fb9ff5ff2e 100644
> --- a/drivers/interconnect/qcom/osm-l3.c
> +++ b/drivers/interconnect/qcom/osm-l3.c
> @@ -78,7 +78,7 @@ static struct qcom_icc_node *sdm845_osm_l3_nodes[] = {
> [SLAVE_OSM_L3] = &sdm845_osm_l3,
> };
>
> -const static struct qcom_icc_desc sdm845_icc_osm_l3 = {
> +static const struct qcom_icc_desc sdm845_icc_osm_l3 = {
> .nodes = sdm845_osm_l3_nodes,
> .num_nodes = ARRAY_SIZE(sdm845_osm_l3_nodes),
> };
> @@ -91,7 +91,7 @@ static struct qcom_icc_node *sc7180_osm_l3_nodes[] = {
> [SLAVE_OSM_L3] = &sc7180_osm_l3,
> };
>
> -const static struct qcom_icc_desc sc7180_icc_osm_l3 = {
> +static const struct qcom_icc_desc sc7180_icc_osm_l3 = {
> .nodes = sc7180_osm_l3_nodes,
> .num_nodes = ARRAY_SIZE(sc7180_osm_l3_nodes),
> };
> diff --git a/drivers/interconnect/qcom/sdm845.c b/drivers/interconnect/qcom/sdm845.c
> index b013b80caa45..f6c7b969520d 100644
> --- a/drivers/interconnect/qcom/sdm845.c
> +++ b/drivers/interconnect/qcom/sdm845.c
> @@ -192,7 +192,7 @@ static struct qcom_icc_node *aggre1_noc_nodes[] = {
> [SLAVE_ANOC_PCIE_A1NOC_SNOC] = &qns_pcie_a1noc_snoc,
> };
>
> -const static struct qcom_icc_desc sdm845_aggre1_noc = {
> +static const struct qcom_icc_desc sdm845_aggre1_noc = {
> .nodes = aggre1_noc_nodes,
> .num_nodes = ARRAY_SIZE(aggre1_noc_nodes),
> .bcms = aggre1_noc_bcms,
> @@ -220,7 +220,7 @@ static struct qcom_icc_node *aggre2_noc_nodes[] = {
> [SLAVE_SERVICE_A2NOC] = &srvc_aggre2_noc,
> };
>
> -const static struct qcom_icc_desc sdm845_aggre2_noc = {
> +static const struct qcom_icc_desc sdm845_aggre2_noc = {
> .nodes = aggre2_noc_nodes,
> .num_nodes = ARRAY_SIZE(aggre2_noc_nodes),
> .bcms = aggre2_noc_bcms,
> @@ -281,7 +281,7 @@ static struct qcom_icc_node *config_noc_nodes[] = {
> [SLAVE_SERVICE_CNOC] = &srvc_cnoc,
> };
>
> -const static struct qcom_icc_desc sdm845_config_noc = {
> +static const struct qcom_icc_desc sdm845_config_noc = {
> .nodes = config_noc_nodes,
> .num_nodes = ARRAY_SIZE(config_noc_nodes),
> .bcms = config_noc_bcms,
> @@ -297,7 +297,7 @@ static struct qcom_icc_node *dc_noc_nodes[] = {
> [SLAVE_MEM_NOC_CFG] = &qhs_memnoc,
> };
>
> -const static struct qcom_icc_desc sdm845_dc_noc = {
> +static const struct qcom_icc_desc sdm845_dc_noc = {
> .nodes = dc_noc_nodes,
> .num_nodes = ARRAY_SIZE(dc_noc_nodes),
> .bcms = dc_noc_bcms,
> @@ -315,7 +315,7 @@ static struct qcom_icc_node *gladiator_noc_nodes[] = {
> [SLAVE_SERVICE_GNOC] = &srvc_gnoc,
> };
>
> -const static struct qcom_icc_desc sdm845_gladiator_noc = {
> +static const struct qcom_icc_desc sdm845_gladiator_noc = {
> .nodes = gladiator_noc_nodes,
> .num_nodes = ARRAY_SIZE(gladiator_noc_nodes),
> .bcms = gladiator_noc_bcms,
> @@ -350,7 +350,7 @@ static struct qcom_icc_node *mem_noc_nodes[] = {
> [SLAVE_EBI1] = &ebi,
> };
>
> -const static struct qcom_icc_desc sdm845_mem_noc = {
> +static const struct qcom_icc_desc sdm845_mem_noc = {
> .nodes = mem_noc_nodes,
> .num_nodes = ARRAY_SIZE(mem_noc_nodes),
> .bcms = mem_noc_bcms,
> @@ -384,7 +384,7 @@ static struct qcom_icc_node *mmss_noc_nodes[] = {
> [SLAVE_CAMNOC_UNCOMP] = &qns_camnoc_uncomp,
> };
>
> -const static struct qcom_icc_desc sdm845_mmss_noc = {
> +static const struct qcom_icc_desc sdm845_mmss_noc = {
> .nodes = mmss_noc_nodes,
> .num_nodes = ARRAY_SIZE(mmss_noc_nodes),
> .bcms = mmss_noc_bcms,
> @@ -430,7 +430,7 @@ static struct qcom_icc_node *system_noc_nodes[] = {
> [SLAVE_TCU] = &xs_sys_tcu_cfg,
> };
>
> -const static struct qcom_icc_desc sdm845_system_noc = {
> +static const struct qcom_icc_desc sdm845_system_noc = {
> .nodes = system_noc_nodes,
> .num_nodes = ARRAY_SIZE(system_noc_nodes),
> .bcms = system_noc_bcms,
> .