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

Configure Feed

Select the types of activity you want to include in your feed.

clk: microchip: mpfs: delete 2 line mpfs_clk_register_foo()

The register functions are now comprised of only a single operation
each and no longer add anything to the driver. Delete them.

Reviewed-by: Daire McNamara <daire.mcnamara@microchip.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220909123123.2699583-12-conor.dooley@microchip.com

authored by

Conor Dooley and committed by
Claudiu Beznea e7df7ba0 5fa27b77

+6 -27
+6 -27
drivers/clk/microchip/clk-mpfs.c
··· 201 201 MSSPLL_FBDIV_WIDTH, 0, REG_MSSPLL_SSCG_2_CR), 202 202 }; 203 203 204 - static int mpfs_clk_register_msspll(struct device *dev, struct mpfs_msspll_hw_clock *msspll_hw, 205 - void __iomem *base) 206 - { 207 - msspll_hw->base = base; 208 - 209 - return devm_clk_hw_register(dev, &msspll_hw->hw); 210 - } 211 - 212 204 static int mpfs_clk_register_mssplls(struct device *dev, struct mpfs_msspll_hw_clock *msspll_hws, 213 205 unsigned int num_clks, struct mpfs_clock_data *data) 214 206 { ··· 210 218 for (i = 0; i < num_clks; i++) { 211 219 struct mpfs_msspll_hw_clock *msspll_hw = &msspll_hws[i]; 212 220 213 - ret = mpfs_clk_register_msspll(dev, msspll_hw, data->msspll_base); 221 + msspll_hw->base = data->msspll_base; 222 + ret = devm_clk_hw_register(dev, &msspll_hw->hw); 214 223 if (ret) 215 224 return dev_err_probe(dev, ret, "failed to register msspll id: %d\n", 216 225 CLK_MSSPLL); ··· 310 317 } 311 318 }; 312 319 313 - static int mpfs_clk_register_cfg(struct device *dev, struct mpfs_cfg_hw_clock *cfg_hw, 314 - void __iomem *base) 315 - { 316 - cfg_hw->cfg.reg = base + cfg_hw->reg_offset; 317 - 318 - return devm_clk_hw_register(dev, &cfg_hw->hw); 319 - } 320 - 321 320 static int mpfs_clk_register_cfgs(struct device *dev, struct mpfs_cfg_hw_clock *cfg_hws, 322 321 unsigned int num_clks, struct mpfs_clock_data *data) 323 322 { ··· 319 334 for (i = 0; i < num_clks; i++) { 320 335 struct mpfs_cfg_hw_clock *cfg_hw = &cfg_hws[i]; 321 336 322 - ret = mpfs_clk_register_cfg(dev, cfg_hw, data->base); 337 + cfg_hw->cfg.reg = data->base + cfg_hw->reg_offset; 338 + ret = devm_clk_hw_register(dev, &cfg_hw->hw); 323 339 if (ret) 324 340 return dev_err_probe(dev, ret, "failed to register clock id: %d\n", 325 341 cfg_hw->id); ··· 444 458 CLK_PERIPH(CLK_CFM, "clk_periph_cfm", PARENT_CLK(AHB), 29, 0), 445 459 }; 446 460 447 - static int mpfs_clk_register_periph(struct device *dev, struct mpfs_periph_hw_clock *periph_hw, 448 - void __iomem *base) 449 - { 450 - periph_hw->periph.reg = base + REG_SUBBLK_CLOCK_CR; 451 - 452 - return devm_clk_hw_register(dev, &periph_hw->hw); 453 - } 454 - 455 461 static int mpfs_clk_register_periphs(struct device *dev, struct mpfs_periph_hw_clock *periph_hws, 456 462 int num_clks, struct mpfs_clock_data *data) 457 463 { ··· 453 475 for (i = 0; i < num_clks; i++) { 454 476 struct mpfs_periph_hw_clock *periph_hw = &periph_hws[i]; 455 477 456 - ret = mpfs_clk_register_periph(dev, periph_hw, data->base); 478 + periph_hw->periph.reg = data->base + REG_SUBBLK_CLOCK_CR; 479 + ret = devm_clk_hw_register(dev, &periph_hw->hw); 457 480 if (ret) 458 481 return dev_err_probe(dev, ret, "failed to register clock id: %d\n", 459 482 periph_hw->id);