Skip to contentSkip to conversation

ASoC: kirkwood: Remove unused headers

PATCH New Mark Brown 1 participant 3 messages Jul 15, 2013

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

PATCH 1/3 ASoC: kirkwood: Remove unused headers

From: Mark Brown <[email protected]>

Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/kirkwood/kirkwood-openrd.c | 2 --
 sound/soc/kirkwood/kirkwood-t5325.c  | 2 --
 2 files changed, 4 deletions(-)
sound/soc/kirkwood/kirkwood-openrd.c +0 -2
index b979c71..addbebc 100644
@@ -16,9 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <sound/soc.h>
-#include <mach/kirkwood.h>
 #include <linux/platform_data/asoc-kirkwood.h>
-#include <asm/mach-types.h>
 #include "../codecs/cs42l51.h"
 
 static int openrd_client_hw_params(struct snd_pcm_substream *substream,
sound/soc/kirkwood/kirkwood-t5325.c +0 -2
index 1d0ed6f..4f4cb56 100644
@@ -15,9 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <sound/soc.h>
-#include <mach/kirkwood.h>
 #include <linux/platform_data/asoc-kirkwood.h>
-#include <asm/mach-types.h>
 #include "../codecs/alc5623.h"
 
 static int t5325_hw_params(struct snd_pcm_substream *substream,
Signature · 1 line
1.8.3.2
author maintainer
#1 lore raw

PATCH 2/3 ASoC: kirkwood: Enable build on non-Kirkwood platforms

From: Mark Brown <[email protected]>

Improve build coverage by enabling build on other platforms if COMPILE_TEST is enabled.

Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/kirkwood/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/kirkwood/Kconfig +3 -3
index c62d715..59085ad 100644
@@ -1,6 +1,6 @@
 config SND_KIRKWOOD_SOC
 	tristate "SoC Audio for the Marvell Kirkwood chip"
-	depends on ARCH_KIRKWOOD
+	depends on ARCH_KIRKWOOD || COMPILE_TEST
 	help
 	  Say Y or M if you want to add support for codecs attached to
 	  the Kirkwood I2S interface. You will also need to select the

@@ -11,7 +11,7 @@ config SND_KIRKWOOD_SOC_I2S
 
 config SND_KIRKWOOD_SOC_OPENRD
 	tristate "SoC Audio support for Kirkwood Openrd Client"
-	depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)
+	depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE || COMPILE_TEST)
 	depends on I2C
 	select SND_KIRKWOOD_SOC_I2S
 	select SND_SOC_CS42L51

@@ -21,7 +21,7 @@ config SND_KIRKWOOD_SOC_OPENRD
 
 config SND_KIRKWOOD_SOC_T5325
 	tristate "SoC Audio support for HP t5325"
-	depends on SND_KIRKWOOD_SOC && MACH_T5325 && I2C
+	depends on SND_KIRKWOOD_SOC && (MACH_T5325 || COMPILE_TEST) && I2C
 	select SND_KIRKWOOD_SOC_I2S
 	select SND_SOC_ALC5623
 	help
Signature · 1 line
1.8.3.2
author maintainer
#2 lore raw

PATCH 3/3 ASoC: kirkwood-i2s: Use devm_clk_get() for extclk

In reply to Mark Brown

From: Mark Brown <[email protected]>

Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/kirkwood/kirkwood-i2s.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
sound/soc/kirkwood/kirkwood-i2s.c +3 -8
index 4c9dad3..44412ea 100644
@@ -498,10 +498,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
 	if (err < 0)
 		return err;
 
-	priv->extclk = clk_get(&pdev->dev, "extclk");
+	priv->extclk = devm_clk_get(&pdev->dev, "extclk");
 	if (!IS_ERR(priv->extclk)) {
 		if (priv->extclk == priv->clk) {
-			clk_put(priv->extclk);
 			priv->extclk = ERR_PTR(-EINVAL);
 		} else {
 			dev_info(&pdev->dev, "found external clock\n");

@@ -529,10 +528,8 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
 		return 0;
 	dev_err(&pdev->dev, "snd_soc_register_component failed\n");
 
-	if (!IS_ERR(priv->extclk)) {
+	if (!IS_ERR(priv->extclk))
 		clk_disable_unprepare(priv->extclk);
-		clk_put(priv->extclk);
-	}
 	clk_disable_unprepare(priv->clk);
 
 	return err;

@@ -544,10 +541,8 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
 
 	snd_soc_unregister_component(&pdev->dev);
 
-	if (!IS_ERR(priv->extclk)) {
+	if (!IS_ERR(priv->extclk))
 		clk_disable_unprepare(priv->extclk);
-		clk_put(priv->extclk);
-	}
 	clk_disable_unprepare(priv->clk);
 
 	return 0;
Signature · 1 line
1.8.3.2