[alsa-devel] [PATCH 1/3] ASoC: fsl_asrc: Propagate the real error code
Instead of returning -EINVAL on error, return the real error code.
Signed-off-by: Fabio Estevam fabio.estevam@nxp.com --- sound/soc/fsl/fsl_asrc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index c1a0e01..15f8ba5 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -892,7 +892,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) ret = fsl_asrc_init(asrc_priv); if (ret) { dev_err(&pdev->dev, "failed to init asrc %d\n", ret); - return -EINVAL; + return ret; }
asrc_priv->channel_avail = 10; @@ -901,14 +901,14 @@ static int fsl_asrc_probe(struct platform_device *pdev) &asrc_priv->asrc_rate); if (ret) { dev_err(&pdev->dev, "failed to get output rate\n"); - return -EINVAL; + return ret; }
ret = of_property_read_u32(np, "fsl,asrc-width", &asrc_priv->asrc_width); if (ret) { dev_err(&pdev->dev, "failed to get output width\n"); - return -EINVAL; + return ret; }
if (asrc_priv->asrc_width != 16 && asrc_priv->asrc_width != 24) {
The 'np' variable is already assigned to 'pdev->dev.of_node', so use it to improve readability.
No functional change.
Signed-off-by: Fabio Estevam fabio.estevam@nxp.com --- sound/soc/fsl/fsl_asrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 15f8ba5..a37339a 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -879,7 +879,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) } }
- if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx35-asrc")) { + if (of_device_is_compatible(np, "fsl,imx35-asrc")) { asrc_priv->channel_bits = 3; clk_map[IN] = input_clk_map_imx35; clk_map[OUT] = output_clk_map_imx35;
On Fri, Aug 19, 2016 at 10:31:00AM -0300, Fabio Estevam wrote:
The 'np' variable is already assigned to 'pdev->dev.of_node', so use it to improve readability.
Oh, now this turned up - must've been caught up in a queue somewhere.
There is no need to announce that the driver has been successfully probed, so remove the unneeded message.
Signed-off-by: Fabio Estevam fabio.estevam@nxp.com --- sound/soc/fsl/fsl_asrc.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index a37339a..b7157ce 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -933,8 +933,6 @@ static int fsl_asrc_probe(struct platform_device *pdev) return ret; }
- dev_info(&pdev->dev, "driver registered\n"); - return 0; }
participants (2)
-
Fabio Estevam -
Mark Brown