Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/dpll: Rename intel_shared_dpll_funcs

Rename intel_shared_dpll_funcs to intel_dpll_funcs
since it needs to represent both shared and individual
dplls.

--v2
-Change intel_global_dpll to intel_dpll_global to be more
in line with the naming standard where the name should
start with the file name [Jani]

--v3
-Drop shared and global altogether [Jani]

--v4
-Keep declarations sorted [Jani]

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20250515071801.2221120-6-suraj.kandpal@intel.com

+14 -14
+12 -12
drivers/gpu/drm/i915/display/intel_dpll_mgr.c
··· 64 64 */ 65 65 66 66 /* platform specific hooks for managing DPLLs */ 67 - struct intel_shared_dpll_funcs { 67 + struct intel_dpll_funcs { 68 68 /* 69 69 * Hook for enabling the pll, called from intel_enable_shared_dpll() if 70 70 * the pll is not already enabled. ··· 670 670 a->fp1 == b->fp1; 671 671 } 672 672 673 - static const struct intel_shared_dpll_funcs ibx_pch_dpll_funcs = { 673 + static const struct intel_dpll_funcs ibx_pch_dpll_funcs = { 674 674 .enable = ibx_pch_dpll_enable, 675 675 .disable = ibx_pch_dpll_disable, 676 676 .get_hw_state = ibx_pch_dpll_get_hw_state, ··· 1270 1270 a->spll == b->spll; 1271 1271 } 1272 1272 1273 - static const struct intel_shared_dpll_funcs hsw_ddi_wrpll_funcs = { 1273 + static const struct intel_dpll_funcs hsw_ddi_wrpll_funcs = { 1274 1274 .enable = hsw_ddi_wrpll_enable, 1275 1275 .disable = hsw_ddi_wrpll_disable, 1276 1276 .get_hw_state = hsw_ddi_wrpll_get_hw_state, 1277 1277 .get_freq = hsw_ddi_wrpll_get_freq, 1278 1278 }; 1279 1279 1280 - static const struct intel_shared_dpll_funcs hsw_ddi_spll_funcs = { 1280 + static const struct intel_dpll_funcs hsw_ddi_spll_funcs = { 1281 1281 .enable = hsw_ddi_spll_enable, 1282 1282 .disable = hsw_ddi_spll_disable, 1283 1283 .get_hw_state = hsw_ddi_spll_get_hw_state, ··· 1302 1302 return true; 1303 1303 } 1304 1304 1305 - static const struct intel_shared_dpll_funcs hsw_ddi_lcpll_funcs = { 1305 + static const struct intel_dpll_funcs hsw_ddi_lcpll_funcs = { 1306 1306 .enable = hsw_ddi_lcpll_enable, 1307 1307 .disable = hsw_ddi_lcpll_disable, 1308 1308 .get_hw_state = hsw_ddi_lcpll_get_hw_state, ··· 2004 2004 a->cfgcr2 == b->cfgcr2; 2005 2005 } 2006 2006 2007 - static const struct intel_shared_dpll_funcs skl_ddi_pll_funcs = { 2007 + static const struct intel_dpll_funcs skl_ddi_pll_funcs = { 2008 2008 .enable = skl_ddi_pll_enable, 2009 2009 .disable = skl_ddi_pll_disable, 2010 2010 .get_hw_state = skl_ddi_pll_get_hw_state, 2011 2011 .get_freq = skl_ddi_pll_get_freq, 2012 2012 }; 2013 2013 2014 - static const struct intel_shared_dpll_funcs skl_ddi_dpll0_funcs = { 2014 + static const struct intel_dpll_funcs skl_ddi_dpll0_funcs = { 2015 2015 .enable = skl_ddi_dpll0_enable, 2016 2016 .disable = skl_ddi_dpll0_disable, 2017 2017 .get_hw_state = skl_ddi_dpll0_get_hw_state, ··· 2486 2486 a->pcsdw12 == b->pcsdw12; 2487 2487 } 2488 2488 2489 - static const struct intel_shared_dpll_funcs bxt_ddi_pll_funcs = { 2489 + static const struct intel_dpll_funcs bxt_ddi_pll_funcs = { 2490 2490 .enable = bxt_ddi_pll_enable, 2491 2491 .disable = bxt_ddi_pll_disable, 2492 2492 .get_hw_state = bxt_ddi_pll_get_hw_state, ··· 4129 4129 a->mg_pll_tdc_coldst_bias == b->mg_pll_tdc_coldst_bias; 4130 4130 } 4131 4131 4132 - static const struct intel_shared_dpll_funcs combo_pll_funcs = { 4132 + static const struct intel_dpll_funcs combo_pll_funcs = { 4133 4133 .enable = combo_pll_enable, 4134 4134 .disable = combo_pll_disable, 4135 4135 .get_hw_state = combo_pll_get_hw_state, 4136 4136 .get_freq = icl_ddi_combo_pll_get_freq, 4137 4137 }; 4138 4138 4139 - static const struct intel_shared_dpll_funcs tbt_pll_funcs = { 4139 + static const struct intel_dpll_funcs tbt_pll_funcs = { 4140 4140 .enable = tbt_pll_enable, 4141 4141 .disable = tbt_pll_disable, 4142 4142 .get_hw_state = tbt_pll_get_hw_state, 4143 4143 .get_freq = icl_ddi_tbt_pll_get_freq, 4144 4144 }; 4145 4145 4146 - static const struct intel_shared_dpll_funcs mg_pll_funcs = { 4146 + static const struct intel_dpll_funcs mg_pll_funcs = { 4147 4147 .enable = mg_pll_enable, 4148 4148 .disable = mg_pll_disable, 4149 4149 .get_hw_state = mg_pll_get_hw_state, ··· 4191 4191 .compare_hw_state = icl_compare_hw_state, 4192 4192 }; 4193 4193 4194 - static const struct intel_shared_dpll_funcs dkl_pll_funcs = { 4194 + static const struct intel_dpll_funcs dkl_pll_funcs = { 4195 4195 .enable = mg_pll_enable, 4196 4196 .disable = mg_pll_disable, 4197 4197 .get_hw_state = dkl_pll_get_hw_state,
+2 -2
drivers/gpu/drm/i915/display/intel_dpll_mgr.h
··· 39 39 struct intel_atomic_state; 40 40 struct intel_crtc; 41 41 struct intel_crtc_state; 42 + struct intel_dpll_funcs; 42 43 struct intel_encoder; 43 44 struct intel_shared_dpll; 44 - struct intel_shared_dpll_funcs; 45 45 46 46 /** 47 47 * enum intel_dpll_id - possible DPLL ids ··· 314 314 /** 315 315 * @funcs: platform specific hooks 316 316 */ 317 - const struct intel_shared_dpll_funcs *funcs; 317 + const struct intel_dpll_funcs *funcs; 318 318 319 319 /** 320 320 * @id: unique identifier for this DPLL