Skip to content

Commit e7df7ba

Browse files
ConchuODclaudiubeznea
authored andcommitted
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 <[email protected]> Signed-off-by: Conor Dooley <[email protected]> Reviewed-by: Claudiu Beznea <[email protected]> Signed-off-by: Claudiu Beznea <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 5fa27b7 commit e7df7ba

File tree

1 file changed

+6
-27
lines changed

1 file changed

+6
-27
lines changed

drivers/clk/microchip/clk-mpfs.c

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,6 @@ static struct mpfs_msspll_hw_clock mpfs_msspll_clks[] = {
201201
MSSPLL_FBDIV_WIDTH, 0, REG_MSSPLL_SSCG_2_CR),
202202
};
203203

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-
212204
static int mpfs_clk_register_mssplls(struct device *dev, struct mpfs_msspll_hw_clock *msspll_hws,
213205
unsigned int num_clks, struct mpfs_clock_data *data)
214206
{
@@ -218,7 +210,8 @@ static int mpfs_clk_register_mssplls(struct device *dev, struct mpfs_msspll_hw_c
218210
for (i = 0; i < num_clks; i++) {
219211
struct mpfs_msspll_hw_clock *msspll_hw = &msspll_hws[i];
220212

221-
ret = mpfs_clk_register_msspll(dev, msspll_hw, data->msspll_base);
213+
msspll_hw->base = data->msspll_base;
214+
ret = devm_clk_hw_register(dev, &msspll_hw->hw);
222215
if (ret)
223216
return dev_err_probe(dev, ret, "failed to register msspll id: %d\n",
224217
CLK_MSSPLL);
@@ -317,14 +310,6 @@ static struct mpfs_cfg_hw_clock mpfs_cfg_clks[] = {
317310
}
318311
};
319312

320-
static int mpfs_clk_register_cfg(struct device *dev, struct mpfs_cfg_hw_clock *cfg_hw,
321-
void __iomem *base)
322-
{
323-
cfg_hw->cfg.reg = base + cfg_hw->reg_offset;
324-
325-
return devm_clk_hw_register(dev, &cfg_hw->hw);
326-
}
327-
328313
static int mpfs_clk_register_cfgs(struct device *dev, struct mpfs_cfg_hw_clock *cfg_hws,
329314
unsigned int num_clks, struct mpfs_clock_data *data)
330315
{
@@ -334,7 +319,8 @@ static int mpfs_clk_register_cfgs(struct device *dev, struct mpfs_cfg_hw_clock *
334319
for (i = 0; i < num_clks; i++) {
335320
struct mpfs_cfg_hw_clock *cfg_hw = &cfg_hws[i];
336321

337-
ret = mpfs_clk_register_cfg(dev, cfg_hw, data->base);
322+
cfg_hw->cfg.reg = data->base + cfg_hw->reg_offset;
323+
ret = devm_clk_hw_register(dev, &cfg_hw->hw);
338324
if (ret)
339325
return dev_err_probe(dev, ret, "failed to register clock id: %d\n",
340326
cfg_hw->id);
@@ -458,14 +444,6 @@ static struct mpfs_periph_hw_clock mpfs_periph_clks[] = {
458444
CLK_PERIPH(CLK_CFM, "clk_periph_cfm", PARENT_CLK(AHB), 29, 0),
459445
};
460446

461-
static int mpfs_clk_register_periph(struct device *dev, struct mpfs_periph_hw_clock *periph_hw,
462-
void __iomem *base)
463-
{
464-
periph_hw->periph.reg = base + REG_SUBBLK_CLOCK_CR;
465-
466-
return devm_clk_hw_register(dev, &periph_hw->hw);
467-
}
468-
469447
static int mpfs_clk_register_periphs(struct device *dev, struct mpfs_periph_hw_clock *periph_hws,
470448
int num_clks, struct mpfs_clock_data *data)
471449
{
@@ -475,7 +453,8 @@ static int mpfs_clk_register_periphs(struct device *dev, struct mpfs_periph_hw_c
475453
for (i = 0; i < num_clks; i++) {
476454
struct mpfs_periph_hw_clock *periph_hw = &periph_hws[i];
477455

478-
ret = mpfs_clk_register_periph(dev, periph_hw, data->base);
456+
periph_hw->periph.reg = data->base + REG_SUBBLK_CLOCK_CR;
457+
ret = devm_clk_hw_register(dev, &periph_hw->hw);
479458
if (ret)
480459
return dev_err_probe(dev, ret, "failed to register clock id: %d\n",
481460
periph_hw->id);

0 commit comments

Comments
 (0)