Commit e7df7ba0 authored by Conor Dooley's avatar Conor Dooley Committed by Claudiu Beznea
Browse files

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: default avatarDaire McNamara <daire.mcnamara@microchip.com>
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220909123123.2699583-12-conor.dooley@microchip.com
parent 5fa27b77

drivers/clk/microchip/clk-mpfs.c

+6 −27
Original line number Diff line number Diff line
@@ -201,14 +201,6 @@ static struct mpfs_msspll_hw_clock mpfs_msspll_clks[] = { 
		MSSPLL_FBDIV_WIDTH, 0, REG_MSSPLL_SSCG_2_CR),

};



static int mpfs_clk_register_msspll(struct device *dev, struct mpfs_msspll_hw_clock *msspll_hw,

				    void __iomem *base)

{

	msspll_hw->base = base;



	return devm_clk_hw_register(dev, &msspll_hw->hw);

}



static int mpfs_clk_register_mssplls(struct device *dev, struct mpfs_msspll_hw_clock *msspll_hws,

				     unsigned int num_clks, struct mpfs_clock_data *data)

{
@@ -218,7 +210,8 @@ static int mpfs_clk_register_mssplls(struct device *dev, struct mpfs_msspll_hw_c 
	for (i = 0; i < num_clks; i++) {

		struct mpfs_msspll_hw_clock *msspll_hw = &msspll_hws[i];



		ret = mpfs_clk_register_msspll(dev, msspll_hw, data->msspll_base);

		msspll_hw->base = data->msspll_base;

		ret = devm_clk_hw_register(dev, &msspll_hw->hw);

		if (ret)

			return dev_err_probe(dev, ret, "failed to register msspll id: %d\n",

					     CLK_MSSPLL);
@@ -317,14 +310,6 @@ static struct mpfs_cfg_hw_clock mpfs_cfg_clks[] = { 
	}

};



static int mpfs_clk_register_cfg(struct device *dev, struct mpfs_cfg_hw_clock *cfg_hw,

				 void __iomem *base)

{

	cfg_hw->cfg.reg = base + cfg_hw->reg_offset;



	return devm_clk_hw_register(dev, &cfg_hw->hw);

}



static int mpfs_clk_register_cfgs(struct device *dev, struct mpfs_cfg_hw_clock *cfg_hws,

				  unsigned int num_clks, struct mpfs_clock_data *data)

{
@@ -334,7 +319,8 @@ static int mpfs_clk_register_cfgs(struct device *dev, struct mpfs_cfg_hw_clock * 
	for (i = 0; i < num_clks; i++) {

		struct mpfs_cfg_hw_clock *cfg_hw = &cfg_hws[i];



		ret = mpfs_clk_register_cfg(dev, cfg_hw, data->base);

		cfg_hw->cfg.reg = data->base + cfg_hw->reg_offset;

		ret = devm_clk_hw_register(dev, &cfg_hw->hw);

		if (ret)

			return dev_err_probe(dev, ret, "failed to register clock id: %d\n",

					     cfg_hw->id);
@@ -458,14 +444,6 @@ static struct mpfs_periph_hw_clock mpfs_periph_clks[] = { 
	CLK_PERIPH(CLK_CFM, "clk_periph_cfm", PARENT_CLK(AHB), 29, 0),

};



static int mpfs_clk_register_periph(struct device *dev, struct mpfs_periph_hw_clock *periph_hw,

				    void __iomem *base)

{

	periph_hw->periph.reg = base + REG_SUBBLK_CLOCK_CR;



	return devm_clk_hw_register(dev, &periph_hw->hw);

}



static int mpfs_clk_register_periphs(struct device *dev, struct mpfs_periph_hw_clock *periph_hws,

				     int num_clks, struct mpfs_clock_data *data)

{
@@ -475,7 +453,8 @@ static int mpfs_clk_register_periphs(struct device *dev, struct mpfs_periph_hw_c 
	for (i = 0; i < num_clks; i++) {

		struct mpfs_periph_hw_clock *periph_hw = &periph_hws[i];



		ret = mpfs_clk_register_periph(dev, periph_hw, data->base);

		periph_hw->periph.reg = data->base + REG_SUBBLK_CLOCK_CR;

		ret = devm_clk_hw_register(dev, &periph_hw->hw);

		if (ret)

			return dev_err_probe(dev, ret, "failed to register clock id: %d\n",

					     periph_hw->id);