All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] ASoC: Ux500: Fixup complile errors due to merge
@ 2012-10-19 13:30 ` Ulf Hansson
  0 siblings, 0 replies; 10+ messages in thread
From: Ulf Hansson @ 2012-10-19 13:30 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, alsa-devel, linux-kernel
  Cc: linux-arm-kernel, Linus Walleij, Lee Jones, Julia Lawall,
	Ulf Hansson

From: Ulf Hansson <ulf.hansson@linaro.org>

Likely during merge of the below commits ended up breaking compilation:
ASoC: Ux500: Enable ux500 MSP driver for Device Tree
ASoC: ux500_msp_i2s: better use devm functions and fix error return code

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 sound/soc/ux500/ux500_msp_i2s.c |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index b7c996e..e6ff328 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -692,19 +692,15 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev,
 	if (!msp)
 		return -ENOMEM;
 
-	if (np) {
-		if (!platform_data) {
-			platform_data = devm_kzalloc(&pdev->dev,
-				sizeof(struct msp_i2s_platform_data), GFP_KERNEL);
-			if (!platform_data)
-				ret = -ENOMEM;
-		}
-	} else
+	if (np && !platform_data) {
+		platform_data = devm_kzalloc(&pdev->dev,
+			sizeof(struct msp_i2s_platform_data), GFP_KERNEL);
 		if (!platform_data)
-			ret = -EINVAL;
+			return -ENOMEM;
+	}
 
-	if (ret)
-		goto err_res;
+	if (!platform_data)
+		return -EINVAL;
 
 	dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__,
 		pdev->name, platform_data->id);
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 1/2] ASoC: Ux500: Fixup complile errors due to merge
@ 2012-10-19 13:30 ` Ulf Hansson
  0 siblings, 0 replies; 10+ messages in thread
From: Ulf Hansson @ 2012-10-19 13:30 UTC (permalink / raw)
  To: linux-arm-kernel

From: Ulf Hansson <ulf.hansson@linaro.org>

Likely during merge of the below commits ended up breaking compilation:
ASoC: Ux500: Enable ux500 MSP driver for Device Tree
ASoC: ux500_msp_i2s: better use devm functions and fix error return code

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 sound/soc/ux500/ux500_msp_i2s.c |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index b7c996e..e6ff328 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -692,19 +692,15 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev,
 	if (!msp)
 		return -ENOMEM;
 
-	if (np) {
-		if (!platform_data) {
-			platform_data = devm_kzalloc(&pdev->dev,
-				sizeof(struct msp_i2s_platform_data), GFP_KERNEL);
-			if (!platform_data)
-				ret = -ENOMEM;
-		}
-	} else
+	if (np && !platform_data) {
+		platform_data = devm_kzalloc(&pdev->dev,
+			sizeof(struct msp_i2s_platform_data), GFP_KERNEL);
 		if (!platform_data)
-			ret = -EINVAL;
+			return -ENOMEM;
+	}
 
-	if (ret)
-		goto err_res;
+	if (!platform_data)
+		return -EINVAL;
 
 	dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__,
 		pdev->name, platform_data->id);
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 1/2] ASoC: Ux500: Fixup complile errors due to merge
@ 2012-10-19 13:30 ` Ulf Hansson
  0 siblings, 0 replies; 10+ messages in thread
From: Ulf Hansson @ 2012-10-19 13:30 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, alsa-devel, linux-kernel
  Cc: linux-arm-kernel, Linus Walleij, Lee Jones, Julia Lawall,
	Ulf Hansson

From: Ulf Hansson <ulf.hansson@linaro.org>

Likely during merge of the below commits ended up breaking compilation:
ASoC: Ux500: Enable ux500 MSP driver for Device Tree
ASoC: ux500_msp_i2s: better use devm functions and fix error return code

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 sound/soc/ux500/ux500_msp_i2s.c |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index b7c996e..e6ff328 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -692,19 +692,15 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev,
 	if (!msp)
 		return -ENOMEM;
 
-	if (np) {
-		if (!platform_data) {
-			platform_data = devm_kzalloc(&pdev->dev,
-				sizeof(struct msp_i2s_platform_data), GFP_KERNEL);
-			if (!platform_data)
-				ret = -ENOMEM;
-		}
-	} else
+	if (np && !platform_data) {
+		platform_data = devm_kzalloc(&pdev->dev,
+			sizeof(struct msp_i2s_platform_data), GFP_KERNEL);
 		if (!platform_data)
-			ret = -EINVAL;
+			return -ENOMEM;
+	}
 
-	if (ret)
-		goto err_res;
+	if (!platform_data)
+		return -EINVAL;
 
 	dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__,
 		pdev->name, platform_data->id);
-- 
1.7.10


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 2/2] ASoC: Ux500: Fixup compile error
  2012-10-19 13:30 ` Ulf Hansson
  (?)
@ 2012-10-19 13:30   ` Ulf Hansson
  -1 siblings, 0 replies; 10+ messages in thread
From: Ulf Hansson @ 2012-10-19 13:30 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, alsa-devel, linux-kernel
  Cc: linux-arm-kernel, Linus Walleij, Lee Jones, Julia Lawall,
	Ulf Hansson

From: Ulf Hansson <ulf.hansson@linaro.org>

The below commit introduced a compile error for a missing include file.
ASoC: ux500_msp_i2s: better use devm functions and fix error return code

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 sound/soc/ux500/ux500_msp_i2s.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index e6ff328..ba15351 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -18,6 +18,7 @@
 #include <linux/pinctrl/consumer.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 #include <linux/of.h>
 
 #include <mach/hardware.h>
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 2/2] ASoC: Ux500: Fixup compile error
@ 2012-10-19 13:30   ` Ulf Hansson
  0 siblings, 0 replies; 10+ messages in thread
From: Ulf Hansson @ 2012-10-19 13:30 UTC (permalink / raw)
  To: linux-arm-kernel

From: Ulf Hansson <ulf.hansson@linaro.org>

The below commit introduced a compile error for a missing include file.
ASoC: ux500_msp_i2s: better use devm functions and fix error return code

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 sound/soc/ux500/ux500_msp_i2s.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index e6ff328..ba15351 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -18,6 +18,7 @@
 #include <linux/pinctrl/consumer.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 #include <linux/of.h>
 
 #include <mach/hardware.h>
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 2/2] ASoC: Ux500: Fixup compile error
@ 2012-10-19 13:30   ` Ulf Hansson
  0 siblings, 0 replies; 10+ messages in thread
From: Ulf Hansson @ 2012-10-19 13:30 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, alsa-devel, linux-kernel
  Cc: linux-arm-kernel, Linus Walleij, Lee Jones, Julia Lawall,
	Ulf Hansson

From: Ulf Hansson <ulf.hansson@linaro.org>

The below commit introduced a compile error for a missing include file.
ASoC: ux500_msp_i2s: better use devm functions and fix error return code

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 sound/soc/ux500/ux500_msp_i2s.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index e6ff328..ba15351 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -18,6 +18,7 @@
 #include <linux/pinctrl/consumer.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 #include <linux/of.h>
 
 #include <mach/hardware.h>
-- 
1.7.10


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] ASoC: Ux500: Fixup complile errors due to merge
  2012-10-19 13:30 ` Ulf Hansson
@ 2012-10-22  8:30   ` Lee Jones
  -1 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2012-10-22  8:30 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Liam Girdwood, Mark Brown, alsa-devel, linux-kernel,
	linux-arm-kernel, Linus Walleij, Julia Lawall, Ulf Hansson

On Fri, 19 Oct 2012, Ulf Hansson wrote:

> From: Ulf Hansson <ulf.hansson@linaro.org>
> 
> Likely during merge of the below commits ended up breaking compilation:
> ASoC: Ux500: Enable ux500 MSP driver for Device Tree
> ASoC: ux500_msp_i2s: better use devm functions and fix error return code

This is already fixed:
  https://patchwork.kernel.org/patch/1593881/

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH 1/2] ASoC: Ux500: Fixup complile errors due to merge
@ 2012-10-22  8:30   ` Lee Jones
  0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2012-10-22  8:30 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, 19 Oct 2012, Ulf Hansson wrote:

> From: Ulf Hansson <ulf.hansson@linaro.org>
> 
> Likely during merge of the below commits ended up breaking compilation:
> ASoC: Ux500: Enable ux500 MSP driver for Device Tree
> ASoC: ux500_msp_i2s: better use devm functions and fix error return code

This is already fixed:
  https://patchwork.kernel.org/patch/1593881/

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] ASoC: Ux500: Fixup compile error
  2012-10-19 13:30   ` Ulf Hansson
@ 2012-10-22  8:33     ` Lee Jones
  -1 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2012-10-22  8:33 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Liam Girdwood, Mark Brown, alsa-devel, linux-kernel,
	linux-arm-kernel, Linus Walleij, Julia Lawall, Ulf Hansson

On Fri, 19 Oct 2012, Ulf Hansson wrote:

> From: Ulf Hansson <ulf.hansson@linaro.org>
> 
> The below commit introduced a compile error for a missing include file.
> ASoC: ux500_msp_i2s: better use devm functions and fix error return code

Already fixed:
  https://patchwork.kernel.org/patch/1593881/

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH 2/2] ASoC: Ux500: Fixup compile error
@ 2012-10-22  8:33     ` Lee Jones
  0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2012-10-22  8:33 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, 19 Oct 2012, Ulf Hansson wrote:

> From: Ulf Hansson <ulf.hansson@linaro.org>
> 
> The below commit introduced a compile error for a missing include file.
> ASoC: ux500_msp_i2s: better use devm functions and fix error return code

Already fixed:
  https://patchwork.kernel.org/patch/1593881/

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-10-22  8:33 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-19 13:30 [PATCH 1/2] ASoC: Ux500: Fixup complile errors due to merge Ulf Hansson
2012-10-19 13:30 ` Ulf Hansson
2012-10-19 13:30 ` Ulf Hansson
2012-10-19 13:30 ` [PATCH 2/2] ASoC: Ux500: Fixup compile error Ulf Hansson
2012-10-19 13:30   ` Ulf Hansson
2012-10-19 13:30   ` Ulf Hansson
2012-10-22  8:33   ` Lee Jones
2012-10-22  8:33     ` Lee Jones
2012-10-22  8:30 ` [PATCH 1/2] ASoC: Ux500: Fixup complile errors due to merge Lee Jones
2012-10-22  8:30   ` Lee Jones

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.