From 6d960dcc4f4f5de004132aa693e9ae174409d9f7 Mon Sep 17 00:00:00 2001 From: David Collins Date: Fri, 19 Jul 2019 17:37:57 -0700 Subject: [PATCH] clk: qcom: clk-rcg: update DEFINE_RCG_DFS() macro Update the DEFINE_RCG_DFS() macro to avoid the potential clock struct name aliasing. This modification originally came from: commit c88b8062898c ("clk: qcom: Add cdiv clocks for gcc, video and camera cc driver for KONA"). Change-Id: I5a8b694b5b8a8b5169639a3e09b1ab4c1936e010 Signed-off-by: David Collins --- drivers/clk/qcom/clk-rcg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h index 030d20079ab8..a7a6ad055c14 100644 --- a/drivers/clk/qcom/clk-rcg.h +++ b/drivers/clk/qcom/clk-rcg.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* Copyright (c) 2013, 2016-2018, The Linux Foundation. All rights reserved. */ +/* Copyright (c) 2013, 2016-2019, The Linux Foundation. All rights reserved. */ #ifndef __QCOM_CLK_RCG_H__ #define __QCOM_CLK_RCG_H__ @@ -179,7 +179,7 @@ struct clk_rcg_dfs_data { }; #define DEFINE_RCG_DFS(r) \ - { .rcg = &r##_src, .init = &r##_init } + { .rcg = &r, .init = &r##_init } extern int qcom_cc_register_rcg_dfs(struct regmap *regmap, const struct clk_rcg_dfs_data *rcgs,