Unverified Commit 38fa8d3c authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Use dev_err_probe() helper 

Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

This patch-set tries to use dev_err_probe() helper function
instead of manual dev_err() code.
I hope ASoC will be more clean code by this patch-set.
parents 98bf33ca 11a95c58

sound/soc/atmel/mikroe-proto.c

+3 −3
Original line number Diff line number Diff line
@@ -144,9 +144,9 @@ static int snd_proto_probe(struct platform_device *pdev) 
	of_node_put(cpu_np);



	ret = snd_soc_register_card(&snd_proto);

	if (ret && ret != -EPROBE_DEFER)

		dev_err(&pdev->dev,

			"snd_soc_register_card() failed: %d\n", ret);

	if (ret)

		dev_err_probe(&pdev->dev, ret,

			"snd_soc_register_card() failed\n");



	return ret;

}

sound/soc/atmel/tse850-pcm5142.c

+12 −20
Original line number Diff line number Diff line
@@ -371,35 +371,27 @@ static int tse850_probe(struct platform_device *pdev) 
	}



	tse850->add = devm_gpiod_get(dev, "axentia,add", GPIOD_OUT_HIGH);

	if (IS_ERR(tse850->add)) {

		if (PTR_ERR(tse850->add) != -EPROBE_DEFER)

			dev_err(dev, "failed to get 'add' gpio\n");

		return PTR_ERR(tse850->add);

	}

	if (IS_ERR(tse850->add))

		return dev_err_probe(dev, PTR_ERR(tse850->add),

				     "failed to get 'add' gpio\n");

	tse850->add_cache = 1;



	tse850->loop1 = devm_gpiod_get(dev, "axentia,loop1", GPIOD_OUT_HIGH);

	if (IS_ERR(tse850->loop1)) {

		if (PTR_ERR(tse850->loop1) != -EPROBE_DEFER)

			dev_err(dev, "failed to get 'loop1' gpio\n");

		return PTR_ERR(tse850->loop1);

	}

	if (IS_ERR(tse850->loop1))

		return dev_err_probe(dev, PTR_ERR(tse850->loop1),

				     "failed to get 'loop1' gpio\n");

	tse850->loop1_cache = 1;



	tse850->loop2 = devm_gpiod_get(dev, "axentia,loop2", GPIOD_OUT_HIGH);

	if (IS_ERR(tse850->loop2)) {

		if (PTR_ERR(tse850->loop2) != -EPROBE_DEFER)

			dev_err(dev, "failed to get 'loop2' gpio\n");

		return PTR_ERR(tse850->loop2);

	}

	if (IS_ERR(tse850->loop2))

		return dev_err_probe(dev, PTR_ERR(tse850->loop2),

				     "failed to get 'loop2' gpio\n");

	tse850->loop2_cache = 1;



	tse850->ana = devm_regulator_get(dev, "axentia,ana");

	if (IS_ERR(tse850->ana)) {

		if (PTR_ERR(tse850->ana) != -EPROBE_DEFER)

			dev_err(dev, "failed to get 'ana' regulator\n");

		return PTR_ERR(tse850->ana);

	}

	if (IS_ERR(tse850->ana))

		return dev_err_probe(dev, PTR_ERR(tse850->ana),

				     "failed to get 'ana' regulator\n");



	ret = regulator_enable(tse850->ana);

	if (ret < 0) {

sound/soc/codecs/ak4118.c

+6 −12
Original line number Diff line number Diff line
@@ -374,20 +374,14 @@ static int ak4118_i2c_probe(struct i2c_client *i2c, 
	i2c_set_clientdata(i2c, ak4118);



	ak4118->reset = devm_gpiod_get(&i2c->dev, "reset", GPIOD_OUT_HIGH);

	if (IS_ERR(ak4118->reset)) {

		ret = PTR_ERR(ak4118->reset);

		if (ret != -EPROBE_DEFER)

			dev_err(&i2c->dev, "Failed to get reset: %d\n", ret);

		return ret;

	}

	if (IS_ERR(ak4118->reset))

		return dev_err_probe(&i2c->dev, PTR_ERR(ak4118->reset),

				     "Failed to get reset\n");



	ak4118->irq = devm_gpiod_get(&i2c->dev, "irq", GPIOD_IN);

	if (IS_ERR(ak4118->irq)) {

		ret = PTR_ERR(ak4118->irq);

		if (ret != -EPROBE_DEFER)

			dev_err(&i2c->dev, "Failed to get IRQ: %d\n", ret);

		return ret;

	}

	if (IS_ERR(ak4118->irq))

		return dev_err_probe(&i2c->dev, PTR_ERR(ak4118->irq),

				     "Failed to get IRQ\n");



	ret = devm_request_threaded_irq(&i2c->dev, gpiod_to_irq(ak4118->irq),

					NULL, ak4118_irq_handler,

sound/soc/codecs/es7241.c

+9 −19
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ static int es7241_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct es7241_data *priv;

	int err;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)
@@ -271,28 +270,19 @@ static int es7241_probe(struct platform_device *pdev) 
	es7241_parse_fmt(dev, priv);



	priv->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(priv->reset)) {

		err = PTR_ERR(priv->reset);

		if (err != -EPROBE_DEFER)

			dev_err(dev, "Failed to get 'reset' gpio: %d", err);

		return err;

	}

	if (IS_ERR(priv->reset))

		return dev_err_probe(dev, PTR_ERR(priv->reset),

				     "Failed to get 'reset' gpio");



	priv->m0 = devm_gpiod_get_optional(dev, "m0", GPIOD_OUT_LOW);

	if (IS_ERR(priv->m0)) {

		err = PTR_ERR(priv->m0);

		if (err != -EPROBE_DEFER)

			dev_err(dev, "Failed to get 'm0' gpio: %d", err);

		return err;

	}

	if (IS_ERR(priv->m0))

		return dev_err_probe(dev, PTR_ERR(priv->m0),

				     "Failed to get 'm0' gpio");



	priv->m1 = devm_gpiod_get_optional(dev, "m1", GPIOD_OUT_LOW);

	if (IS_ERR(priv->m1)) {

		err = PTR_ERR(priv->m1);

		if (err != -EPROBE_DEFER)

			dev_err(dev, "Failed to get 'm1' gpio: %d", err);

		return err;

	}

	if (IS_ERR(priv->m1))

		return dev_err_probe(dev, PTR_ERR(priv->m1),

				     "Failed to get 'm1' gpio");



	return devm_snd_soc_register_component(&pdev->dev,

				      &es7241_component_driver,

sound/soc/codecs/max9759.c

+9 −19
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ static int max9759_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct max9759 *priv;

	int err;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)
@@ -149,29 +148,20 @@ static int max9759_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, priv);



	priv->gpiod_shutdown = devm_gpiod_get(dev, "shutdown", GPIOD_OUT_HIGH);

	if (IS_ERR(priv->gpiod_shutdown)) {

		err = PTR_ERR(priv->gpiod_shutdown);

		if (err != -EPROBE_DEFER)

			dev_err(dev, "Failed to get 'shutdown' gpio: %d", err);

		return err;

	}

	if (IS_ERR(priv->gpiod_shutdown))

		return dev_err_probe(dev, PTR_ERR(priv->gpiod_shutdown),

				     "Failed to get 'shutdown' gpio");



	priv->gpiod_mute = devm_gpiod_get(dev, "mute", GPIOD_OUT_HIGH);

	if (IS_ERR(priv->gpiod_mute)) {

		err = PTR_ERR(priv->gpiod_mute);

		if (err != -EPROBE_DEFER)

			dev_err(dev, "Failed to get 'mute' gpio: %d", err);

		return err;

	}

	if (IS_ERR(priv->gpiod_mute))

		return dev_err_probe(dev, PTR_ERR(priv->gpiod_mute),

				     "Failed to get 'mute' gpio");

	priv->is_mute = true;



	priv->gpiod_gain = devm_gpiod_get_array(dev, "gain", GPIOD_OUT_HIGH);

	if (IS_ERR(priv->gpiod_gain)) {

		err = PTR_ERR(priv->gpiod_gain);

		if (err != -EPROBE_DEFER)

			dev_err(dev, "Failed to get 'gain' gpios: %d", err);

		return err;

	}

	if (IS_ERR(priv->gpiod_gain))

		return dev_err_probe(dev, PTR_ERR(priv->gpiod_gain),

				     "Failed to get 'gain' gpios");

	priv->gain = 0;



	if (priv->gpiod_gain->ndescs != 2) {