[PATCH 1/2] ASoC: mxs-sgtl5000: Remove unneeded 'ret' variable

[PATCH 1/2] ASoC: mxs-sgtl5000: Remove unneeded 'ret' variable

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

Variable 'ret' is not needed here, so just remove it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 sound/soc/mxs/mxs-sgtl5000.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c
index b1d9b5e..4f74b05 100644
--- a/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@ -116,7 +116,7 @@ static int mxs_sgtl5000_probe_dt(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
 	struct device_node *saif_np[2], *codec_np;
-	int i, ret = 0;
+	int i;
 
 	if (!np)
 		return 1; /* no device tree */
@@ -142,7 +142,7 @@ static int mxs_sgtl5000_probe_dt(struct platform_device *pdev)
 	of_node_put(saif_np[0]);
 	of_node_put(saif_np[1]);
 
-	return ret;
+	return 0;
 }
 
 static int mxs_sgtl5000_probe(struct platform_device *pdev)
-- 
1.7.9.5

[PATCH 2/2] ASoC: mxs-sgtl5000: Remove unneeded fields from snd_soc_dai_link

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

It makes no sense to hardcode the I2C bus into the codec_name field.

cpu_dai_name and platform_name are also overwritten later in 
mxs_sgtl5000_probe_dt().

So remove the three fields, as mxs platform is dt-only platform.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 sound/soc/mxs/mxs-sgtl5000.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c
index 4f74b05..1b134d7 100644
--- a/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@ -90,17 +90,11 @@ static struct snd_soc_dai_link mxs_sgtl5000_dai[] = {
 		.name		= "HiFi Tx",
 		.stream_name	= "HiFi Playback",
 		.codec_dai_name	= "sgtl5000",
-		.codec_name	= "sgtl5000.0-000a",
-		.cpu_dai_name	= "mxs-saif.0",
-		.platform_name	= "mxs-saif.0",
 		.ops		= &mxs_sgtl5000_hifi_ops,
 	}, {
 		.name		= "HiFi Rx",
 		.stream_name	= "HiFi Capture",
 		.codec_dai_name	= "sgtl5000",
-		.codec_name	= "sgtl5000.0-000a",
-		.cpu_dai_name	= "mxs-saif.1",
-		.platform_name	= "mxs-saif.1",
 		.ops		= &mxs_sgtl5000_hifi_ops,
 	},
 };
-- 
1.7.9.5

Re: [PATCH 1/2] ASoC: mxs-sgtl5000: Remove unneeded 'ret' variable

[Shawn Guo]

On Wed, Apr 24, 2013 at 01:23:14PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Variable 'ret' is not needed here, so just remove it.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Shawn Guo <shawn.guo@linaro.org>

Re: [PATCH 2/2] ASoC: mxs-sgtl5000: Remove unneeded fields from snd_soc_dai_link

[Shawn Guo]

On Wed, Apr 24, 2013 at 01:23:15PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> It makes no sense to hardcode the I2C bus into the codec_name field.
> 
> cpu_dai_name and platform_name are also overwritten later in 
> mxs_sgtl5000_probe_dt().
> 
> So remove the three fields, as mxs platform is dt-only platform.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Shawn Guo <shawn.guo@linaro.org>

Re: [PATCH 1/2] ASoC: mxs-sgtl5000: Remove unneeded 'ret' variable

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 203 bytes --]

On Wed, Apr 24, 2013 at 01:23:14PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Variable 'ret' is not needed here, so just remove it.

Applied both, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 1/2] ASoC: mxs-sgtl5000: Remove unneeded 'ret' variable

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 203 bytes --]

On Wed, Apr 24, 2013 at 01:23:14PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Variable 'ret' is not needed here, so just remove it.

Applied both, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]