Commit 016fca59 authored by Georgi Djakov's avatar Georgi Djakov
Browse files

Merge branch 'icc-const' into icc-next 

Constify structs that are not modified.

Link: https://lore.kernel.org/r/20220412102623.227607-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parents 828ff75c 7123f883

drivers/interconnect/qcom/icc-rpm.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ int qnoc_probe(struct platform_device *pdev) 
	const struct qcom_icc_desc *desc;

	struct icc_onecell_data *data;

	struct icc_provider *provider;

	struct qcom_icc_node **qnodes;

	struct qcom_icc_node * const *qnodes;

	struct qcom_icc_provider *qp;

	struct icc_node *node;

	size_t num_nodes, i;

drivers/interconnect/qcom/icc-rpm.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct qcom_icc_node { 
};



struct qcom_icc_desc {

	struct qcom_icc_node **nodes;

	struct qcom_icc_node * const *nodes;

	size_t num_nodes;

	const char * const *clocks;

	size_t num_clocks;

drivers/interconnect/qcom/icc-rpmh.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct icc_onecell_data *data;

	struct icc_provider *provider;

	struct qcom_icc_node **qnodes, *qn;

	struct qcom_icc_node * const *qnodes, *qn;

	struct qcom_icc_provider *qp;

	struct icc_node *node;

	size_t num_nodes, i, j;

drivers/interconnect/qcom/icc-rpmh.h

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
struct qcom_icc_provider {

	struct icc_provider provider;

	struct device *dev;

	struct qcom_icc_bcm **bcms;

	struct qcom_icc_bcm * const *bcms;

	size_t num_bcms;

	struct bcm_voter *voter;

};
@@ -112,9 +112,9 @@ struct qcom_icc_fabric { 
};



struct qcom_icc_desc {

	struct qcom_icc_node **nodes;

	struct qcom_icc_node * const *nodes;

	size_t num_nodes;

	struct qcom_icc_bcm **bcms;

	struct qcom_icc_bcm * const *bcms;

	size_t num_bcms;

};

drivers/interconnect/qcom/msm8916.c

+6 −6
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ static struct qcom_icc_node snoc_pcnoc_slv = { 
	.links = snoc_pcnoc_slv_links,

};



static struct qcom_icc_node *msm8916_snoc_nodes[] = {

static struct qcom_icc_node * const msm8916_snoc_nodes[] = {

	[BIMC_SNOC_SLV] = &bimc_snoc_slv,

	[MASTER_JPEG] = &mas_jpeg,

	[MASTER_MDP_PORT0] = &mas_mdp,
@@ -1228,7 +1228,7 @@ static const struct regmap_config msm8916_snoc_regmap_config = { 
	.fast_io	= true,

};



static struct qcom_icc_desc msm8916_snoc = {

static const struct qcom_icc_desc msm8916_snoc = {

	.type = QCOM_ICC_NOC,

	.nodes = msm8916_snoc_nodes,

	.num_nodes = ARRAY_SIZE(msm8916_snoc_nodes),
@@ -1236,7 +1236,7 @@ static struct qcom_icc_desc msm8916_snoc = { 
	.qos_offset = 0x7000,

};



static struct qcom_icc_node *msm8916_bimc_nodes[] = {

static struct qcom_icc_node * const msm8916_bimc_nodes[] = {

	[BIMC_SNOC_MAS] = &bimc_snoc_mas,

	[MASTER_AMPSS_M0] = &mas_apss,

	[MASTER_GRAPHICS_3D] = &mas_gfx,
@@ -1256,7 +1256,7 @@ static const struct regmap_config msm8916_bimc_regmap_config = { 
	.fast_io	= true,

};



static struct qcom_icc_desc msm8916_bimc = {

static const struct qcom_icc_desc msm8916_bimc = {

	.type = QCOM_ICC_BIMC,

	.nodes = msm8916_bimc_nodes,

	.num_nodes = ARRAY_SIZE(msm8916_bimc_nodes),
@@ -1264,7 +1264,7 @@ static struct qcom_icc_desc msm8916_bimc = { 
	.qos_offset = 0x8000,

};



static struct qcom_icc_node *msm8916_pcnoc_nodes[] = {

static struct qcom_icc_node * const msm8916_pcnoc_nodes[] = {

	[MASTER_BLSP_1] = &mas_blsp_1,

	[MASTER_DEHR] = &mas_dehr,

	[MASTER_LPASS] = &mas_audio,
@@ -1325,7 +1325,7 @@ static const struct regmap_config msm8916_pcnoc_regmap_config = { 
	.fast_io	= true,

};



static struct qcom_icc_desc msm8916_pcnoc = {

static const struct qcom_icc_desc msm8916_pcnoc = {

	.type = QCOM_ICC_NOC,

	.nodes = msm8916_pcnoc_nodes,

	.num_nodes = ARRAY_SIZE(msm8916_pcnoc_nodes),