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

clk: xgene: Delete duplicated name field

X-Gene clocks implement it's name in the clock private struct.
This is a duplication of the name field. We can delete the field
and rely on the common implementation to retrieve the name.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

authored by

Matthias Brugger and committed by
Stephen Boyd
78e50c6d bb68a4f1

+13 -15
+13 -15
drivers/clk/clk-xgene.c
··· 60 60 61 61 struct xgene_clk_pll { 62 62 struct clk_hw hw; 63 - const char *name; 64 63 void __iomem *reg; 65 64 spinlock_t *lock; 66 65 u32 pll_offset; ··· 74 75 u32 data; 75 76 76 77 data = xgene_clk_read(pllclk->reg + pllclk->pll_offset); 77 - pr_debug("%s pll %s\n", pllclk->name, 78 + pr_debug("%s pll %s\n", __clk_get_name(hw->clk), 78 79 data & REGSPEC_RESET_F1_MASK ? "disabled" : "enabled"); 79 80 80 81 return data & REGSPEC_RESET_F1_MASK ? 0 : 1; ··· 112 113 fref = parent_rate / nref; 113 114 fvco = fref * nfb; 114 115 } 115 - pr_debug("%s pll recalc rate %ld parent %ld\n", pllclk->name, 116 + pr_debug("%s pll recalc rate %ld parent %ld\n", __clk_get_name(hw->clk), 116 117 fvco / nout, parent_rate); 117 118 118 119 return fvco / nout; ··· 145 146 init.parent_names = parent_name ? &parent_name : NULL; 146 147 init.num_parents = parent_name ? 1 : 0; 147 148 148 - apmclk->name = name; 149 149 apmclk->reg = reg; 150 150 apmclk->lock = lock; 151 151 apmclk->pll_offset = pll_offset; ··· 208 210 209 211 struct xgene_clk { 210 212 struct clk_hw hw; 211 - const char *name; 212 213 spinlock_t *lock; 213 214 struct xgene_dev_parameters param; 214 215 }; ··· 225 228 spin_lock_irqsave(pclk->lock, flags); 226 229 227 230 if (pclk->param.csr_reg != NULL) { 228 - pr_debug("%s clock enabled\n", pclk->name); 231 + pr_debug("%s clock enabled\n", __clk_get_name(hw->clk)); 229 232 reg = __pa(pclk->param.csr_reg); 230 233 /* First enable the clock */ 231 234 data = xgene_clk_read(pclk->param.csr_reg + ··· 234 237 xgene_clk_write(data, pclk->param.csr_reg + 235 238 pclk->param.reg_clk_offset); 236 239 pr_debug("%s clock PADDR base %pa clk offset 0x%08X mask 0x%08X value 0x%08X\n", 237 - pclk->name, &reg, 240 + __clk_get_name(hw->clk), &reg, 238 241 pclk->param.reg_clk_offset, pclk->param.reg_clk_mask, 239 242 data); 240 243 ··· 245 248 xgene_clk_write(data, pclk->param.csr_reg + 246 249 pclk->param.reg_csr_offset); 247 250 pr_debug("%s CSR RESET PADDR base %pa csr offset 0x%08X mask 0x%08X value 0x%08X\n", 248 - pclk->name, &reg, 251 + __clk_get_name(hw->clk), &reg, 249 252 pclk->param.reg_csr_offset, pclk->param.reg_csr_mask, 250 253 data); 251 254 } ··· 266 269 spin_lock_irqsave(pclk->lock, flags); 267 270 268 271 if (pclk->param.csr_reg != NULL) { 269 - pr_debug("%s clock disabled\n", pclk->name); 272 + pr_debug("%s clock disabled\n", __clk_get_name(hw->clk)); 270 273 /* First put the CSR in reset */ 271 274 data = xgene_clk_read(pclk->param.csr_reg + 272 275 pclk->param.reg_csr_offset); ··· 292 295 u32 data = 0; 293 296 294 297 if (pclk->param.csr_reg != NULL) { 295 - pr_debug("%s clock checking\n", pclk->name); 298 + pr_debug("%s clock checking\n", __clk_get_name(hw->clk)); 296 299 data = xgene_clk_read(pclk->param.csr_reg + 297 300 pclk->param.reg_clk_offset); 298 - pr_debug("%s clock is %s\n", pclk->name, 301 + pr_debug("%s clock is %s\n", __clk_get_name(hw->clk), 299 302 data & pclk->param.reg_clk_mask ? "enabled" : 300 303 "disabled"); 301 304 } ··· 318 321 data &= (1 << pclk->param.reg_divider_width) - 1; 319 322 320 323 pr_debug("%s clock recalc rate %ld parent %ld\n", 321 - pclk->name, parent_rate / data, parent_rate); 324 + __clk_get_name(hw->clk), 325 + parent_rate / data, parent_rate); 326 + 322 327 return parent_rate / data; 323 328 } else { 324 329 pr_debug("%s clock recalc rate %ld parent %ld\n", 325 - pclk->name, parent_rate, parent_rate); 330 + __clk_get_name(hw->clk), parent_rate, parent_rate); 326 331 return parent_rate; 327 332 } 328 333 } ··· 356 357 data |= divider; 357 358 xgene_clk_write(data, pclk->param.divider_reg + 358 359 pclk->param.reg_divider_offset); 359 - pr_debug("%s clock set rate %ld\n", pclk->name, 360 + pr_debug("%s clock set rate %ld\n", __clk_get_name(hw->clk), 360 361 parent_rate / divider_save); 361 362 } else { 362 363 divider_save = 1; ··· 418 419 init.parent_names = parent_name ? &parent_name : NULL; 419 420 init.num_parents = parent_name ? 1 : 0; 420 421 421 - apmclk->name = name; 422 422 apmclk->lock = lock; 423 423 apmclk->hw.init = &init; 424 424 apmclk->param = *parameters;