Commit d61876a2 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Stephen Boyd
Browse files

clkdev: Simplify devm_clk_hw_register_clkdev() function 



Use devm_add_action_or_reset() instead of devres_alloc() and
devres_add(), which works the same. This will simplify the
code. There is no functional changes.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220623115719.52683-3-andriy.shevchenko@linux.intel.com


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

drivers/clk/clkdev.c

+10 −14
Original line number Diff line number Diff line
@@ -346,9 +346,9 @@ int clk_hw_register_clkdev(struct clk_hw *hw, const char *con_id, 
}

EXPORT_SYMBOL(clk_hw_register_clkdev);



static void devm_clkdev_release(struct device *dev, void *res)

static void devm_clkdev_release(void *res)

{

	clkdev_drop(*(struct clk_lookup **)res);

	clkdev_drop(res);

}



/**
@@ -369,17 +369,13 @@ static void devm_clkdev_release(struct device *dev, void *res) 
int devm_clk_hw_register_clkdev(struct device *dev, struct clk_hw *hw,

				const char *con_id, const char *dev_id)

{

	int rval = -ENOMEM;

	struct clk_lookup **cl;



	cl = devres_alloc(devm_clkdev_release, sizeof(*cl), GFP_KERNEL);

	if (cl) {

		rval = do_clk_register_clkdev(hw, cl, con_id, dev_id);

		if (!rval)

			devres_add(dev, cl);

		else

			devres_free(cl);

	}

	struct clk_lookup *cl;

	int rval;



	rval = do_clk_register_clkdev(hw, &cl, con_id, dev_id);

	if (rval)

		return rval;



	return devm_add_action_or_reset(dev, devm_clkdev_release, cl);

}

EXPORT_SYMBOL(devm_clk_hw_register_clkdev);