Re: [PATCH 18/21] clk: qcom: clk-rpm: Remove a bunch of superfluous code

[Bjorn Andersson]

On Tue 26 Jan 06:45 CST 2021, Lee Jones wrote:

> Fixes the following W=1 kernel build warning(s):
> 
>  drivers/clk/qcom/clk-rpm.c:453:29: warning: ‘clk_rpm_branch_ops’ defined but not used [-Wunused-const-variable=]
> 
> Cc: Andy Gross <agross@xxxxxxxxxx>
> Cc: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> Cc: Michael Turquette <mturquette@xxxxxxxxxxxx>
> Cc: Stephen Boyd <sboyd@xxxxxxxxxx>
> Cc: linux-arm-msm@xxxxxxxxxxxxxxx
> Cc: linux-clk@xxxxxxxxxxxxxxx

Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>

> Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
> ---
>  drivers/clk/qcom/clk-rpm.c | 63 --------------------------------------
>  1 file changed, 63 deletions(-)
> 
> diff --git a/drivers/clk/qcom/clk-rpm.c b/drivers/clk/qcom/clk-rpm.c
> index f71d228fd6bd5..a18811c380187 100644
> --- a/drivers/clk/qcom/clk-rpm.c
> +++ b/drivers/clk/qcom/clk-rpm.c
> @@ -73,62 +73,6 @@
>  		},							      \
>  	}
>  
> -#define DEFINE_CLK_RPM_PXO_BRANCH(_platform, _name, _active, r_id, r)	      \
> -	static struct clk_rpm _platform##_##_active;			      \
> -	static struct clk_rpm _platform##_##_name = {			      \
> -		.rpm_clk_id = (r_id),					      \
> -		.active_only = true,					      \
> -		.peer = &_platform##_##_active,				      \
> -		.rate = (r),						      \
> -		.branch = true,						      \
> -		.hw.init = &(struct clk_init_data){			      \
> -			.ops = &clk_rpm_branch_ops,			      \
> -			.name = #_name,					      \
> -			.parent_names = (const char *[]){ "pxo_board" },      \
> -			.num_parents = 1,				      \
> -		},							      \
> -	};								      \
> -	static struct clk_rpm _platform##_##_active = {			      \
> -		.rpm_clk_id = (r_id),					      \
> -		.peer = &_platform##_##_name,				      \
> -		.rate = (r),						      \
> -		.branch = true,						      \
> -		.hw.init = &(struct clk_init_data){			      \
> -			.ops = &clk_rpm_branch_ops,			      \
> -			.name = #_active,				      \
> -			.parent_names = (const char *[]){ "pxo_board" },      \
> -			.num_parents = 1,				      \
> -		},							      \
> -	}
> -
> -#define DEFINE_CLK_RPM_CXO_BRANCH(_platform, _name, _active, r_id, r)	      \
> -	static struct clk_rpm _platform##_##_active;			      \
> -	static struct clk_rpm _platform##_##_name = {			      \
> -		.rpm_clk_id = (r_id),					      \
> -		.peer = &_platform##_##_active,				      \
> -		.rate = (r),						      \
> -		.branch = true,						      \
> -		.hw.init = &(struct clk_init_data){			      \
> -			.ops = &clk_rpm_branch_ops,			      \
> -			.name = #_name,					      \
> -			.parent_names = (const char *[]){ "cxo_board" },      \
> -			.num_parents = 1,				      \
> -		},							      \
> -	};								      \
> -	static struct clk_rpm _platform##_##_active = {			      \
> -		.rpm_clk_id = (r_id),					      \
> -		.active_only = true,					      \
> -		.peer = &_platform##_##_name,				      \
> -		.rate = (r),						      \
> -		.branch = true,						      \
> -		.hw.init = &(struct clk_init_data){			      \
> -			.ops = &clk_rpm_branch_ops,			      \
> -			.name = #_active,				      \
> -			.parent_names = (const char *[]){ "cxo_board" },      \
> -			.num_parents = 1,				      \
> -		},							      \
> -	}
> -
>  #define to_clk_rpm(_hw) container_of(_hw, struct clk_rpm, hw)
>  
>  struct rpm_cc;
> @@ -450,13 +394,6 @@ static const struct clk_ops clk_rpm_ops = {
>  	.recalc_rate	= clk_rpm_recalc_rate,
>  };
>  
> -static const struct clk_ops clk_rpm_branch_ops = {
> -	.prepare	= clk_rpm_prepare,
> -	.unprepare	= clk_rpm_unprepare,
> -	.round_rate	= clk_rpm_round_rate,
> -	.recalc_rate	= clk_rpm_recalc_rate,
> -};
> -
>  /* MSM8660/APQ8060 */
>  DEFINE_CLK_RPM(msm8660, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK);
>  DEFINE_CLK_RPM(msm8660, sfab_clk, sfab_a_clk, QCOM_RPM_SYS_FABRIC_CLK);
> -- 
> 2.25.1
>