Commit 2ef16254 authored by Sean Anderson's avatar Sean Anderson Committed by Stephen Boyd
Browse files

clk: vc5: Use dev_err_probe 



Convert uses of dev_err (+ return) to dev_err_probe.

Signed-off-by: default avatarSean Anderson <sean.anderson@seco.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Link: https://lore.kernel.org/r/20210809223813.3766204-2-sean.anderson@seco.com


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

drivers/clk/clk-versaclock5.c

+10 −10
Original line number Diff line number Diff line
@@ -930,10 +930,9 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id) 
		return -EPROBE_DEFER;



	vc5->regmap = devm_regmap_init_i2c(client, &vc5_regmap_config);

	if (IS_ERR(vc5->regmap)) {

		dev_err(&client->dev, "failed to allocate register map\n");

		return PTR_ERR(vc5->regmap);

	}

	if (IS_ERR(vc5->regmap))

		return dev_err_probe(&client->dev, PTR_ERR(vc5->regmap),

				     "failed to allocate register map\n");



	/* Register clock input mux */

	memset(&init, 0, sizeof(init));
@@ -957,10 +956,9 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id) 
		    __clk_get_name(vc5->pin_clkin);

	}



	if (!init.num_parents) {

		dev_err(&client->dev, "no input clock specified!\n");

		return -EINVAL;

	}

	if (!init.num_parents)

		return dev_err_probe(&client->dev, -EINVAL,

				     "no input clock specified!\n");



	/* Configure Optional Loading Capacitance for external XTAL */

	if (!(vc5->chip_info->flags & VC5_HAS_INTERNAL_XTAL)) {
@@ -1099,14 +1097,16 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id) 


	ret = of_clk_add_hw_provider(client->dev.of_node, vc5_of_clk_get, vc5);

	if (ret) {

		dev_err(&client->dev, "unable to add clk provider\n");

		dev_err_probe(&client->dev, ret,

			      "unable to add clk provider\n");

		goto err_clk;

	}



	return 0;



err_clk_register:

	dev_err(&client->dev, "unable to register %s\n", init.name);

	dev_err_probe(&client->dev, ret,

		      "unable to register %s\n", init.name);

	kfree(init.name); /* clock framework made a copy of the name */

err_clk:

	if (vc5->chip_info->flags & VC5_HAS_INTERNAL_XTAL)