[PATCH] sound: soc: pxa2xx-ac97: prepare and unprepare the clocks

[PATCH] sound: soc: pxa2xx-ac97: prepare and unprepare the clocks

[Robert Jarzmik]

Add the clock prepare and unprepare call to the driver initialization
phase. This will remove a warning once the PXA architecture is migrated
to the clock infrastructure.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 sound/arm/pxa2xx-ac97-lib.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 66de90e..39c3969 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -152,9 +152,9 @@ static inline void pxa_ac97_cold_pxa27x(void)
 	gsr_bits = 0;
 
 	/* PXA27x Developers Manual section 13.5.2.2.1 */
-	clk_enable(ac97conf_clk);
+	clk_prepare_enable(ac97conf_clk);
 	udelay(5);
-	clk_disable(ac97conf_clk);
+	clk_disable_unprepare(ac97conf_clk);
 	GCR = GCR_COLD_RST | GCR_WARM_RST;
 }
 #endif
@@ -299,14 +299,14 @@ static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id)
 int pxa2xx_ac97_hw_suspend(void)
 {
 	GCR |= GCR_ACLINK_OFF;
-	clk_disable(ac97_clk);
+	clk_disable_unprepare(ac97_clk);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend);
 
 int pxa2xx_ac97_hw_resume(void)
 {
-	clk_enable(ac97_clk);
+	clk_prepare_enable(ac97_clk);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);
@@ -368,7 +368,7 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev)
 		goto err_clk;
 	}
 
-	ret = clk_enable(ac97_clk);
+	ret = clk_prepare_enable(ac97_clk);
 	if (ret)
 		goto err_clk2;
 
@@ -403,7 +403,7 @@ void pxa2xx_ac97_hw_remove(struct platform_device *dev)
 		clk_put(ac97conf_clk);
 		ac97conf_clk = NULL;
 	}
-	clk_disable(ac97_clk);
+	clk_disable_unprepare(ac97_clk);
 	clk_put(ac97_clk);
 	ac97_clk = NULL;
 }
-- 
2.0.0.rc2

Re: [PATCH] sound: soc: pxa2xx-ac97: prepare and unprepare the clocks

[Mark Brown]

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

On Mon, Jun 09, 2014 at 09:59:12PM +0200, Robert Jarzmik wrote:
> Add the clock prepare and unprepare call to the driver initialization
> phase. This will remove a warning once the PXA architecture is migrated
> to the clock infrastructure.

Applied, please use subject lines matching the usual style for the
subsystem.

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

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

Re: [PATCH] sound: soc: pxa2xx-ac97: prepare and unprepare the clocks

[Robert Jarzmik]

Mark Brown <broonie@kernel.org> writes:

> On Mon, Jun 09, 2014 at 09:59:12PM +0200, Robert Jarzmik wrote:
>> Add the clock prepare and unprepare call to the driver initialization
>> phase. This will remove a warning once the PXA architecture is migrated
>> to the clock infrastructure.
>
> Applied, please use subject lines matching the usual style for the
> subsystem.
Oh yeah, sorry.
Next time I'll "ALSA: pxa2xx" if that's the correct one ...

Cheers.

-- 
Robert

Re: [PATCH] sound: soc: pxa2xx-ac97: prepare and unprepare the clocks

[Mark Brown]

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

On Mon, Jun 09, 2014 at 10:27:45PM +0200, Robert Jarzmik wrote:
> Mark Brown <broonie@kernel.org> writes:

> > Applied, please use subject lines matching the usual style for the
> > subsystem.

> Oh yeah, sorry.
> Next time I'll "ALSA: pxa2xx" if that's the correct one ...

ASoC: - in general just do a git shortlog on the file(s) you're changing
and look at what people are using (unless they're massively inconsistent
of course!).

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

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