Commit 6f691a58 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Stephen Boyd
Browse files

clk: mediatek: Switch to clk_hw provider APIs 



As part of the effort to improve the MediaTek clk drivers, the next step
is to switch from the old 'struct clk' clk prodivder APIs to the new
'struct clk_hw' ones.

In a previous patch, 'struct clk_onecell_data' was replaced with
'struct clk_hw_onecell_data', with (struct clk_hw *)->clk and
__clk_get_hw() bridging the new data structures and old code.

Now switch from the old 'clk_(un)?register*()' APIs to the new
'clk_hw_(un)?register*()' ones. This is done with the coccinelle script
below.

Unfortunately this also leaves clk-mt8173.c with a compile error that
would need a coccinelle script longer than the actual diff to fix. This
last part is fixed up by hand.

    // Fix prototypes
    @@
    identifier F =~ "^mtk_clk_register_";
    @@
    - struct clk *
    + struct clk_hw *
      F(...);

    // Fix calls to mtk_clk_register_<singular>
    @ reg @
    identifier F =~ "^mtk_clk_register_";
    identifier FS =~ "^mtk_clk_register_[a-z_]*s";
    identifier I;
    expression clk_data;
    expression E;
    @@
      FS(...) {
	    ...
    -	struct clk *I;
    +	struct clk_hw *hw;
	    ...
	    for (...;...;...) {
		    ...
    (
    -		I
    +		hw
		    =
    -		clk_register_fixed_rate(
    +		clk_hw_register_fixed_rate(
					    ...
		    );
    |
    -		I
    +		hw
		    =
    -		clk_register_fixed_factor(
    +		clk_hw_register_fixed_factor(
					    ...
		    );
    |
    -		I
    +		hw
		    =
    -		clk_register_divider(
    +		clk_hw_register_divider(
					    ...
		    );
    |
    -		I
    +		hw
		    =
		    F(...);
    )
		    ...
		    if (
    -		    IS_ERR(I)
    +		    IS_ERR(hw)
		       ) {
			    pr_err(...,
    -			       I
    +			       hw
			    ,...);
			    ...
		    }

    -		clk_data->hws[E] = __clk_get_hw(I);
    +		clk_data->hws[E] = hw;
	    }
	    ...
      }

    @ depends on reg @
    identifier reg.I;
    @@
      return PTR_ERR(
    - I
    + hw
      );

    // Fix mtk_clk_register_composite to return clk_hw instead of clk
    @@
    identifier I, R;
    expression E;
    @@
    - struct clk *
    + struct clk_hw *
      mtk_clk_register_composite(...) {
	    ...
    -	struct clk *I;
    +	struct clk_hw *hw;
	    ...
    -	I = clk_register_composite(
    +	hw = clk_hw_register_composite(
		    ...);
	    if (IS_ERR(
    -		   I
    +		   hw
		       )) {
		    ...
		    R = PTR_ERR(
    -			      I
    +			      hw
				  );
		    ...
	    }

	    return
    -		I
    +		hw
	    ;
	    ...
      }

    // Fix other mtk_clk_register_<singular> to return clk_hw instead of clk
    @@
    identifier F =~ "^mtk_clk_register_";
    identifier I, D, C;
    expression E;
    @@
    - struct clk *
    + struct clk_hw *
      F(...) {
	    ...
    -	struct clk *I;
    +	int ret;
	    ...
    -	I = clk_register(D, E);
    +	ret = clk_hw_register(D, E);
	    ...
    (
    -	if (IS_ERR(I))
    +	if (ret) {
		    kfree(C);
    +		return ERR_PTR(ret);
    +	}
    |
    -	if (IS_ERR(I))
    +	if (ret)
	    {
		    kfree(C);
    -		return I;
    +		return ERR_PTR(ret);
	    }
    )

    -	return I;
    +	return E;
      }

    // Fix mtk_clk_unregister_<singular> to take clk_hw instead of clk
    @@
    identifier F =~ "^mtk_clk_unregister_";
    identifier I, I2;
    @@
      static void F(
    - 	struct clk *I
    +	struct clk_hw *I2
      )
      {
	    ...
    -	struct clk_hw *I2;
	    ...
    -	I2 = __clk_get_hw(I);
	    ...
    (
    -	clk_unregister(I);
    +	clk_hw_unregister(I2);
    |
    -	clk_unregister_composite(I);
    +	clk_hw_unregister_composite(I2);
    )
	    ...
      }

    // Fix calls to mtk_clk_unregister_*()
    @@
    identifier F =~ "^mtk_clk_unregister_";
    expression I;
    expression E;
    @@
    - F(I->hws[E]->clk);
    + F(I->hws[E]);

Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarMiles Chen <miles.chen@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: default avatarMiles Chen <miles.chen@mediatek.com>
Link: https://lore.kernel.org/r/20220519071610.423372-5-wenst@chromium.org


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 609cc5e1

drivers/clk/mediatek/clk-apmixed.c

+7 −5
Original line number Diff line number Diff line
@@ -70,12 +70,12 @@ static const struct clk_ops mtk_ref2usb_tx_ops = { 
	.unprepare	= mtk_ref2usb_tx_unprepare,

};



struct clk * __init mtk_clk_register_ref2usb_tx(const char *name,

struct clk_hw * __init mtk_clk_register_ref2usb_tx(const char *name,

			const char *parent_name, void __iomem *reg)

{

	struct mtk_ref2usb_tx *tx;

	struct clk_init_data init = {};

	struct clk *clk;

	int ret;



	tx = kzalloc(sizeof(*tx), GFP_KERNEL);

	if (!tx)
@@ -89,12 +89,14 @@ struct clk * __init mtk_clk_register_ref2usb_tx(const char *name, 
	init.parent_names = &parent_name;

	init.num_parents = 1;



	clk = clk_register(NULL, &tx->hw);

	ret = clk_hw_register(NULL, &tx->hw);



	if (IS_ERR(clk))

	if (ret) {

		kfree(tx);

		return ERR_PTR(ret);

	}



	return clk;

	return &tx->hw;

}



MODULE_LICENSE("GPL");

drivers/clk/mediatek/clk-cpumux.c

+18 −18
Original line number Diff line number Diff line
@@ -57,12 +57,12 @@ static const struct clk_ops clk_cpumux_ops = { 
	.set_parent = clk_cpumux_set_parent,

};



static struct clk *

static struct clk_hw *

mtk_clk_register_cpumux(const struct mtk_composite *mux,

			struct regmap *regmap)

{

	struct mtk_clk_cpumux *cpumux;

	struct clk *clk;

	int ret;

	struct clk_init_data init;



	cpumux = kzalloc(sizeof(*cpumux), GFP_KERNEL);
@@ -81,25 +81,24 @@ mtk_clk_register_cpumux(const struct mtk_composite *mux, 
	cpumux->regmap = regmap;

	cpumux->hw.init = &init;



	clk = clk_register(NULL, &cpumux->hw);

	if (IS_ERR(clk))

	ret = clk_hw_register(NULL, &cpumux->hw);

	if (ret) {

		kfree(cpumux);

		return ERR_PTR(ret);

	}



	return clk;

	return &cpumux->hw;

}



static void mtk_clk_unregister_cpumux(struct clk *clk)

static void mtk_clk_unregister_cpumux(struct clk_hw *hw)

{

	struct mtk_clk_cpumux *cpumux;

	struct clk_hw *hw;



	hw = __clk_get_hw(clk);

	if (!hw)

		return;



	cpumux = to_mtk_clk_cpumux(hw);



	clk_unregister(clk);

	clk_hw_unregister(hw);

	kfree(cpumux);

}
@@ -108,7 +107,7 @@ int mtk_clk_register_cpumuxes(struct device_node *node, 
			      struct clk_hw_onecell_data *clk_data)

{

	int i;

	struct clk *clk;

	struct clk_hw *hw;

	struct regmap *regmap;



	regmap = device_node_to_regmap(node);
@@ -126,13 +125,14 @@ int mtk_clk_register_cpumuxes(struct device_node *node, 
			continue;

		}



		clk = mtk_clk_register_cpumux(mux, regmap);

		if (IS_ERR(clk)) {

			pr_err("Failed to register clk %s: %pe\n", mux->name, clk);

		hw = mtk_clk_register_cpumux(mux, regmap);

		if (IS_ERR(hw)) {

			pr_err("Failed to register clk %s: %pe\n", mux->name,

			       hw);

			goto err;

		}



		clk_data->hws[mux->id] = __clk_get_hw(clk);

		clk_data->hws[mux->id] = hw;

	}



	return 0;
@@ -144,11 +144,11 @@ int mtk_clk_register_cpumuxes(struct device_node *node, 
		if (IS_ERR_OR_NULL(clk_data->hws[mux->id]))

			continue;



		mtk_clk_unregister_cpumux(clk_data->hws[mux->id]->clk);

		mtk_clk_unregister_cpumux(clk_data->hws[mux->id]);

		clk_data->hws[mux->id] = ERR_PTR(-ENOENT);

	}



	return PTR_ERR(clk);

	return PTR_ERR(hw);

}



void mtk_clk_unregister_cpumuxes(const struct mtk_composite *clks, int num,
@@ -162,7 +162,7 @@ void mtk_clk_unregister_cpumuxes(const struct mtk_composite *clks, int num, 
		if (IS_ERR_OR_NULL(clk_data->hws[mux->id]))

			continue;



		mtk_clk_unregister_cpumux(clk_data->hws[mux->id]->clk);

		mtk_clk_unregister_cpumux(clk_data->hws[mux->id]);

		clk_data->hws[mux->id] = ERR_PTR(-ENOENT);

	}

}

drivers/clk/mediatek/clk-gate.c

+18 −18
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ const struct clk_ops mtk_clk_gate_ops_no_setclr_inv = { 
};

EXPORT_SYMBOL_GPL(mtk_clk_gate_ops_no_setclr_inv);



static struct clk *mtk_clk_register_gate(const char *name,

static struct clk_hw *mtk_clk_register_gate(const char *name,

					 const char *parent_name,

					 struct regmap *regmap, int set_ofs,

					 int clr_ofs, int sta_ofs, u8 bit,
@@ -160,7 +160,7 @@ static struct clk *mtk_clk_register_gate(const char *name, 
					 unsigned long flags, struct device *dev)

{

	struct mtk_clk_gate *cg;

	struct clk *clk;

	int ret;

	struct clk_init_data init = {};



	cg = kzalloc(sizeof(*cg), GFP_KERNEL);
@@ -181,25 +181,24 @@ static struct clk *mtk_clk_register_gate(const char *name, 


	cg->hw.init = &init;



	clk = clk_register(dev, &cg->hw);

	if (IS_ERR(clk))

	ret = clk_hw_register(dev, &cg->hw);

	if (ret) {

		kfree(cg);

		return ERR_PTR(ret);

	}



	return clk;

	return &cg->hw;

}



static void mtk_clk_unregister_gate(struct clk *clk)

static void mtk_clk_unregister_gate(struct clk_hw *hw)

{

	struct mtk_clk_gate *cg;

	struct clk_hw *hw;



	hw = __clk_get_hw(clk);

	if (!hw)

		return;



	cg = to_mtk_clk_gate(hw);



	clk_unregister(clk);

	clk_hw_unregister(hw);

	kfree(cg);

}
@@ -209,7 +208,7 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, 
				    struct device *dev)

{

	int i;

	struct clk *clk;

	struct clk_hw *hw;

	struct regmap *regmap;



	if (!clk_data)
@@ -230,7 +229,7 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, 
			continue;

		}



		clk = mtk_clk_register_gate(gate->name, gate->parent_name,

		hw = mtk_clk_register_gate(gate->name, gate->parent_name,

					    regmap,

					    gate->regs->set_ofs,

					    gate->regs->clr_ofs,
@@ -238,12 +237,13 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, 
					    gate->shift, gate->ops,

					    gate->flags, dev);



		if (IS_ERR(clk)) {

			pr_err("Failed to register clk %s: %pe\n", gate->name, clk);

		if (IS_ERR(hw)) {

			pr_err("Failed to register clk %s: %pe\n", gate->name,

			       hw);

			goto err;

		}



		clk_data->hws[gate->id] = __clk_get_hw(clk);

		clk_data->hws[gate->id] = hw;

	}



	return 0;
@@ -255,11 +255,11 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, 
		if (IS_ERR_OR_NULL(clk_data->hws[gate->id]))

			continue;



		mtk_clk_unregister_gate(clk_data->hws[gate->id]->clk);

		mtk_clk_unregister_gate(clk_data->hws[gate->id]);

		clk_data->hws[gate->id] = ERR_PTR(-ENOENT);

	}



	return PTR_ERR(clk);

	return PTR_ERR(hw);

}



int mtk_clk_register_gates(struct device_node *node,
@@ -284,7 +284,7 @@ void mtk_clk_unregister_gates(const struct mtk_gate *clks, int num, 
		if (IS_ERR_OR_NULL(clk_data->hws[gate->id]))

			continue;



		mtk_clk_unregister_gate(clk_data->hws[gate->id]->clk);

		mtk_clk_unregister_gate(clk_data->hws[gate->id]);

		clk_data->hws[gate->id] = ERR_PTR(-ENOENT);

	}

}

drivers/clk/mediatek/clk-mt8173.c

+5 −7
Original line number Diff line number Diff line
@@ -993,6 +993,7 @@ static void __init mtk_apmixedsys_init(struct device_node *node) 
{

	struct clk_hw_onecell_data *clk_data;

	void __iomem *base;

	struct clk_hw *hw;

	struct clk *clk;

	int r, i;
@@ -1013,16 +1014,13 @@ static void __init mtk_apmixedsys_init(struct device_node *node) 
	for (i = 0; i < ARRAY_SIZE(apmixed_usb); i++) {

		const struct mtk_clk_usb *cku = &apmixed_usb[i];



		clk = mtk_clk_register_ref2usb_tx(cku->name, cku->parent,

					base + cku->reg_ofs);



		if (IS_ERR(clk)) {

			pr_err("Failed to register clk %s: %ld\n", cku->name,

					PTR_ERR(clk));

		hw = mtk_clk_register_ref2usb_tx(cku->name, cku->parent, base + cku->reg_ofs);

		if (IS_ERR(hw)) {

			pr_err("Failed to register clk %s: %ld\n", cku->name, PTR_ERR(hw));

			continue;

		}



		clk_data->hws[cku->id] = __clk_get_hw(clk);

		clk_data->hws[cku->id] = hw;

	}



	clk = clk_register_divider(NULL, "hdmi_ref", "tvdpll_594m", 0,

drivers/clk/mediatek/clk-mtk.c

+39 −37
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ int mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, int num, 
				struct clk_hw_onecell_data *clk_data)

{

	int i;

	struct clk *clk;

	struct clk_hw *hw;



	if (!clk_data)

		return -ENOMEM;
@@ -59,15 +59,16 @@ int mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, int num, 
			continue;

		}



		clk = clk_register_fixed_rate(NULL, rc->name, rc->parent, 0,

		hw = clk_hw_register_fixed_rate(NULL, rc->name, rc->parent, 0,

					      rc->rate);



		if (IS_ERR(clk)) {

			pr_err("Failed to register clk %s: %pe\n", rc->name, clk);

		if (IS_ERR(hw)) {

			pr_err("Failed to register clk %s: %pe\n", rc->name,

			       hw);

			goto err;

		}



		clk_data->hws[rc->id] = __clk_get_hw(clk);

		clk_data->hws[rc->id] = hw;

	}



	return 0;
@@ -83,7 +84,7 @@ int mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, int num, 
		clk_data->hws[rc->id] = ERR_PTR(-ENOENT);

	}



	return PTR_ERR(clk);

	return PTR_ERR(hw);

}

EXPORT_SYMBOL_GPL(mtk_clk_register_fixed_clks);
@@ -111,7 +112,7 @@ int mtk_clk_register_factors(const struct mtk_fixed_factor *clks, int num, 
			     struct clk_hw_onecell_data *clk_data)

{

	int i;

	struct clk *clk;

	struct clk_hw *hw;



	if (!clk_data)

		return -ENOMEM;
@@ -124,15 +125,16 @@ int mtk_clk_register_factors(const struct mtk_fixed_factor *clks, int num, 
			continue;

		}



		clk = clk_register_fixed_factor(NULL, ff->name, ff->parent_name,

		hw = clk_hw_register_fixed_factor(NULL, ff->name, ff->parent_name,

				CLK_SET_RATE_PARENT, ff->mult, ff->div);



		if (IS_ERR(clk)) {

			pr_err("Failed to register clk %s: %pe\n", ff->name, clk);

		if (IS_ERR(hw)) {

			pr_err("Failed to register clk %s: %pe\n", ff->name,

			       hw);

			goto err;

		}



		clk_data->hws[ff->id] = __clk_get_hw(clk);

		clk_data->hws[ff->id] = hw;

	}



	return 0;
@@ -148,7 +150,7 @@ int mtk_clk_register_factors(const struct mtk_fixed_factor *clks, int num, 
		clk_data->hws[ff->id] = ERR_PTR(-ENOENT);

	}



	return PTR_ERR(clk);

	return PTR_ERR(hw);

}

EXPORT_SYMBOL_GPL(mtk_clk_register_factors);
@@ -172,10 +174,10 @@ void mtk_clk_unregister_factors(const struct mtk_fixed_factor *clks, int num, 
}

EXPORT_SYMBOL_GPL(mtk_clk_unregister_factors);



static struct clk *mtk_clk_register_composite(const struct mtk_composite *mc,

static struct clk_hw *mtk_clk_register_composite(const struct mtk_composite *mc,

		void __iomem *base, spinlock_t *lock)

{

	struct clk *clk;

	struct clk_hw *hw;

	struct clk_mux *mux = NULL;

	struct clk_gate *gate = NULL;

	struct clk_divider *div = NULL;
@@ -239,18 +241,18 @@ static struct clk *mtk_clk_register_composite(const struct mtk_composite *mc, 
		div_ops = &clk_divider_ops;

	}



	clk = clk_register_composite(NULL, mc->name, parent_names, num_parents,

	hw = clk_hw_register_composite(NULL, mc->name, parent_names, num_parents,

		mux_hw, mux_ops,

		div_hw, div_ops,

		gate_hw, gate_ops,

		mc->flags);



	if (IS_ERR(clk)) {

		ret = PTR_ERR(clk);

	if (IS_ERR(hw)) {

		ret = PTR_ERR(hw);

		goto err_out;

	}



	return clk;

	return hw;

err_out:

	kfree(div);

	kfree(gate);
@@ -259,15 +261,13 @@ static struct clk *mtk_clk_register_composite(const struct mtk_composite *mc, 
	return ERR_PTR(ret);

}



static void mtk_clk_unregister_composite(struct clk *clk)

static void mtk_clk_unregister_composite(struct clk_hw *hw)

{

	struct clk_hw *hw;

	struct clk_composite *composite;

	struct clk_mux *mux = NULL;

	struct clk_gate *gate = NULL;

	struct clk_divider *div = NULL;



	hw = __clk_get_hw(clk);

	if (!hw)

		return;
@@ -279,7 +279,7 @@ static void mtk_clk_unregister_composite(struct clk *clk) 
	if (composite->rate_hw)

		div = to_clk_divider(composite->rate_hw);



	clk_unregister_composite(clk);

	clk_hw_unregister_composite(hw);

	kfree(div);

	kfree(gate);

	kfree(mux);
@@ -289,7 +289,7 @@ int mtk_clk_register_composites(const struct mtk_composite *mcs, int num, 
				void __iomem *base, spinlock_t *lock,

				struct clk_hw_onecell_data *clk_data)

{

	struct clk *clk;

	struct clk_hw *hw;

	int i;



	if (!clk_data)
@@ -304,14 +304,15 @@ int mtk_clk_register_composites(const struct mtk_composite *mcs, int num, 
			continue;

		}



		clk = mtk_clk_register_composite(mc, base, lock);

		hw = mtk_clk_register_composite(mc, base, lock);



		if (IS_ERR(clk)) {

			pr_err("Failed to register clk %s: %pe\n", mc->name, clk);

		if (IS_ERR(hw)) {

			pr_err("Failed to register clk %s: %pe\n", mc->name,

			       hw);

			goto err;

		}



		clk_data->hws[mc->id] = __clk_get_hw(clk);

		clk_data->hws[mc->id] = hw;

	}



	return 0;
@@ -323,11 +324,11 @@ int mtk_clk_register_composites(const struct mtk_composite *mcs, int num, 
		if (IS_ERR_OR_NULL(clk_data->hws[mcs->id]))

			continue;



		mtk_clk_unregister_composite(clk_data->hws[mc->id]->clk);

		mtk_clk_unregister_composite(clk_data->hws[mc->id]);

		clk_data->hws[mc->id] = ERR_PTR(-ENOENT);

	}



	return PTR_ERR(clk);

	return PTR_ERR(hw);

}

EXPORT_SYMBOL_GPL(mtk_clk_register_composites);
@@ -345,7 +346,7 @@ void mtk_clk_unregister_composites(const struct mtk_composite *mcs, int num, 
		if (IS_ERR_OR_NULL(clk_data->hws[mc->id]))

			continue;



		mtk_clk_unregister_composite(clk_data->hws[mc->id]->clk);

		mtk_clk_unregister_composite(clk_data->hws[mc->id]);

		clk_data->hws[mc->id] = ERR_PTR(-ENOENT);

	}

}
@@ -355,7 +356,7 @@ int mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num, 
			      void __iomem *base, spinlock_t *lock,

			      struct clk_hw_onecell_data *clk_data)

{

	struct clk *clk;

	struct clk_hw *hw;

	int i;



	if (!clk_data)
@@ -370,16 +371,17 @@ int mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num, 
			continue;

		}



		clk = clk_register_divider(NULL, mcd->name, mcd->parent_name,

		hw = clk_hw_register_divider(NULL, mcd->name, mcd->parent_name,

			mcd->flags, base +  mcd->div_reg, mcd->div_shift,

			mcd->div_width, mcd->clk_divider_flags, lock);



		if (IS_ERR(clk)) {

			pr_err("Failed to register clk %s: %pe\n", mcd->name, clk);

		if (IS_ERR(hw)) {

			pr_err("Failed to register clk %s: %pe\n", mcd->name,

			       hw);

			goto err;

		}



		clk_data->hws[mcd->id] = __clk_get_hw(clk);

		clk_data->hws[mcd->id] = hw;

	}



	return 0;
@@ -391,11 +393,11 @@ int mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num, 
		if (IS_ERR_OR_NULL(clk_data->hws[mcd->id]))

			continue;



		mtk_clk_unregister_composite(clk_data->hws[mcd->id]->clk);

		mtk_clk_unregister_composite(clk_data->hws[mcd->id]);

		clk_data->hws[mcd->id] = ERR_PTR(-ENOENT);

	}



	return PTR_ERR(clk);

	return PTR_ERR(hw);

}



void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num,