Unverified Commit cf9441ad authored by Stephen Boyd's avatar Stephen Boyd Committed by Mark Brown
Browse files

ASoC: Remove dev_err() usage after platform_get_irq() 



We don't need dev_err() messages when platform_get_irq() fails now that
platform_get_irq() prints an error message itself when something goes
wrong. Let's remove these prints with a simple semantic patch.

// <smpl>
@@
expression ret;
struct platform_device *E;
@@

ret =
(
platform_get_irq(E, ...)
|
platform_get_irq_byname(E, ...)
);

if ( \( ret < 0 \| ret <= 0 \) )
{
(
-if (ret != -EPROBE_DEFER)
-{ ...
-dev_err(...);
-... }
|
...
-dev_err(...);
)
...
}
// </smpl>

While we're here, remove braces on if statements that only have one
statement (manually).

Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20190730181557.90391-50-swboyd@chromium.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f24e41d3

sound/soc/atmel/atmel-classd.c

+2 −5
Original line number Diff line number Diff line
@@ -571,11 +571,8 @@ static int atmel_classd_probe(struct platform_device *pdev) 
	dd->pdata = pdata;



	dd->irq = platform_get_irq(pdev, 0);

	if (dd->irq < 0) {

		ret = dd->irq;

		dev_err(dev, "failed to could not get irq: %d\n", ret);

		return ret;

	}

	if (dd->irq < 0)

		return dd->irq;



	dd->pclk = devm_clk_get(dev, "pclk");

	if (IS_ERR(dd->pclk)) {

sound/soc/atmel/atmel-pdmic.c

+2 −5
Original line number Diff line number Diff line
@@ -612,11 +612,8 @@ static int atmel_pdmic_probe(struct platform_device *pdev) 
	dd->dev = dev;



	dd->irq = platform_get_irq(pdev, 0);

	if (dd->irq < 0) {

		ret = dd->irq;

		dev_err(dev, "failed to get irq: %d\n", ret);

		return ret;

	}

	if (dd->irq < 0)

		return dd->irq;



	dd->pclk = devm_clk_get(dev, "pclk");

	if (IS_ERR(dd->pclk)) {

sound/soc/bcm/cygnus-ssp.c

+2 −5
Original line number Diff line number Diff line
@@ -1342,11 +1342,8 @@ static int cygnus_ssp_probe(struct platform_device *pdev) 
	}



	cygaud->irq_num = platform_get_irq(pdev, 0);

	if (cygaud->irq_num <= 0) {

		dev_err(dev, "platform_get_irq failed\n");

		err = cygaud->irq_num;

		return err;

	}

	if (cygaud->irq_num <= 0)

		return cygaud->irq_num;



	err = audio_clk_init(pdev, cygaud);

	if (err) {

sound/soc/codecs/msm8916-wcd-analog.c

+3 −9
Original line number Diff line number Diff line
@@ -1185,10 +1185,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) 
	}



	irq = platform_get_irq_byname(pdev, "mbhc_switch_int");

	if (irq < 0) {

		dev_err(dev, "failed to get mbhc switch irq\n");

	if (irq < 0)

		return irq;

	}



	ret = devm_request_threaded_irq(dev, irq, NULL,

			       pm8916_mbhc_switch_irq_handler,
@@ -1200,10 +1198,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) 


	if (priv->mbhc_btn_enabled) {

		irq = platform_get_irq_byname(pdev, "mbhc_but_press_det");

		if (irq < 0) {

			dev_err(dev, "failed to get button press irq\n");

		if (irq < 0)

			return irq;

		}



		ret = devm_request_threaded_irq(dev, irq, NULL,

				       mbhc_btn_press_irq_handler,
@@ -1214,10 +1210,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) 
			dev_err(dev, "cannot request mbhc button press irq\n");



		irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det");

		if (irq < 0) {

			dev_err(dev, "failed to get button release irq\n");

		if (irq < 0)

			return irq;

		}



		ret = devm_request_threaded_irq(dev, irq, NULL,

				       mbhc_btn_release_irq_handler,

sound/soc/codecs/twl6040.c

+1 −3
Original line number Diff line number Diff line
@@ -1108,10 +1108,8 @@ static int twl6040_probe(struct snd_soc_component *component) 
	priv->component = component;



	priv->plug_irq = platform_get_irq(pdev, 0);

	if (priv->plug_irq < 0) {

		dev_err(component->dev, "invalid irq: %d\n", priv->plug_irq);

	if (priv->plug_irq < 0)

		return priv->plug_irq;

	}



	INIT_DELAYED_WORK(&priv->hs_jack.work, twl6040_accessory_work);

CRA Git | Maintained and supported by SUSTech CRA and CCSE