Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 2c225036 authored by Nicolin Chen's avatar Nicolin Chen Committed by Mark Brown
Browse files

ASoC: fsl_ssi: Refine printk outputs 



This patches unifies the error message in the "failed to xxxx" format.

It also reduces the length of one line and adds spaces to an operator.

Signed-off-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Tested-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Acked-by: default avatarTimur Tabi <timur@tabi.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent af4f7f38

sound/soc/fsl/fsl_ssi.c

+8 −8
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, 
	ssi->dai_fmt = fmt;



	if (fsl_ssi_is_i2s_master(ssi) && IS_ERR(ssi->baudclk)) {

		dev_err(dev, "baudclk is missing which is necessary for master mode\n");

		dev_err(dev, "missing baudclk for master mode\n");

		return -EINVAL;

	}
@@ -1307,7 +1307,7 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev, 
		ssi->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(ssi->clk)) {

		ret = PTR_ERR(ssi->clk);

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

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

		return ret;

	}
@@ -1323,7 +1323,7 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev, 
	/* Do not error out for slave cases that live without a baud clock */

	ssi->baudclk = devm_clk_get(dev, "baud");

	if (IS_ERR(ssi->baudclk))

		dev_dbg(dev, "could not get baud clock: %ld\n",

		dev_dbg(dev, "failed to get baud clock: %ld\n",

			 PTR_ERR(ssi->baudclk));



	ssi->dma_params_tx.maxburst = ssi->dma_maxburst;
@@ -1447,7 +1447,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
						      &regconfig);

	}

	if (IS_ERR(ssi->regs)) {

		dev_err(dev, "Failed to init register map\n");

		dev_err(dev, "failed to init register map\n");

		return PTR_ERR(ssi->regs);

	}
@@ -1513,7 +1513,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
		mutex_init(&ssi->ac97_reg_lock);

		ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev);

		if (ret) {

			dev_err(dev, "could not set AC'97 ops\n");

			dev_err(dev, "failed to set AC'97 ops\n");

			goto error_ac97_ops;

		}

	}
@@ -1529,7 +1529,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
		ret = devm_request_irq(dev, ssi->irq, fsl_ssi_isr, 0,

				       dev_name(dev), ssi);

		if (ret < 0) {

			dev_err(dev, "could not claim irq %u\n", ssi->irq);

			dev_err(dev, "failed to claim irq %u\n", ssi->irq);

			goto error_asoc_register;

		}

	}
@@ -1571,7 +1571,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 


		ret = of_property_read_u32(np, "cell-index", &ssi_idx);

		if (ret) {

			dev_err(dev, "cannot get SSI index property\n");

			dev_err(dev, "failed to get SSI index property\n");

			goto error_sound_card;

		}