Re: [PATCH] ASoC: omap-dmic: Use devm_clk_get

2014-07-14 Thread Mark Brown 
On Fri, Jul 11, 2014 at 09:44:06AM +0530, Himangi Saraogi wrote:
 This patch introduces the use of managed interfaces like devm_clk_get
 and does away with the clk_puts in the probe and remove functions. A
 label is also done away with.

Applied, thanks.


signature.asc
Description: Digital signature

Re: [PATCH] ASoC: omap-dmic: Use devm_clk_get

2014-07-13 Thread Peter Ujfalusi 
On 07/11/2014 07:14 AM, Himangi Saraogi wrote:
 This patch introduces the use of managed interfaces like devm_clk_get
 and does away with the clk_puts in the probe and remove functions. A
 label is also done away with.

Acked-by: Peter Ujfalusi peter.ujfal...@ti.com

 
 Signed-off-by: Himangi Saraogi himangi...@gmail.com
 ---
 This is a follow up to ASoC: omap-dmic: use managed interfaces which
 failed to apply as the other devm_ functions were introduced by a patch
 ASoC: omap-dmic: Use devm_snd_soc_register_component.
 
  sound/soc/omap/omap-dmic.c | 29 ++---
  1 file changed, 6 insertions(+), 23 deletions(-)
 
 diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
 index f125eb9..0f34e28 100644
 --- a/sound/soc/omap/omap-dmic.c
 +++ b/sound/soc/omap/omap-dmic.c
 @@ -466,7 +466,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
  
   mutex_init(dmic-mutex);
  
 - dmic-fclk = clk_get(dmic-dev, fck);
 + dmic-fclk = devm_clk_get(dmic-dev, fck);
   if (IS_ERR(dmic-fclk)) {
   dev_err(dmic-dev, cant get fck\n);
   return -ENODEV;
 @@ -475,8 +475,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
   res = platform_get_resource_byname(pdev, IORESOURCE_MEM, dma);
   if (!res) {
   dev_err(dmic-dev, invalid dma memory resource\n);
 - ret = -ENODEV;
 - goto err_put_clk;
 + return -ENODEV;
   }
   dmic-dma_data.addr = res-start + OMAP_DMIC_DATA_REG;
  
 @@ -484,34 +483,19 @@ static int asoc_dmic_probe(struct platform_device *pdev)
  
   res = platform_get_resource_byname(pdev, IORESOURCE_MEM, mpu);
   dmic-io_base = devm_ioremap_resource(pdev-dev, res);
 - if (IS_ERR(dmic-io_base)) {
 - ret = PTR_ERR(dmic-io_base);
 - goto err_put_clk;
 - }
 + if (IS_ERR(dmic-io_base))
 + return PTR_ERR(dmic-io_base);
  
  
   ret = devm_snd_soc_register_component(pdev-dev,
 omap_dmic_component,
 omap_dmic_dai, 1);
   if (ret)
 - goto err_put_clk;
 + return ret;
  
   ret = omap_pcm_platform_register(pdev-dev);
   if (ret)
 - goto err_put_clk;
 -
 - return 0;
 -
 -err_put_clk:
 - clk_put(dmic-fclk);
 - return ret;
 -}
 -
 -static int asoc_dmic_remove(struct platform_device *pdev)
 -{
 - struct omap_dmic *dmic = platform_get_drvdata(pdev);
 -
 - clk_put(dmic-fclk);
 + return ret;
  
   return 0;
  }
 @@ -529,7 +513,6 @@ static struct platform_driver asoc_dmic_driver = {
   .of_match_table = omap_dmic_of_match,
   },
   .probe = asoc_dmic_probe,
 - .remove = asoc_dmic_remove,
  };
  
  module_platform_driver(asoc_dmic_driver);
 


-- 
Péter
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] ASoC: omap-dmic: Use devm_clk_get

2014-07-10 Thread Himangi Saraogi 
This patch introduces the use of managed interfaces like devm_clk_get
and does away with the clk_puts in the probe and remove functions. A
label is also done away with.

Signed-off-by: Himangi Saraogi himangi...@gmail.com
---
This is a follow up to ASoC: omap-dmic: use managed interfaces which
failed to apply as the other devm_ functions were introduced by a patch
ASoC: omap-dmic: Use devm_snd_soc_register_component.

 sound/soc/omap/omap-dmic.c | 29 ++---
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index f125eb9..0f34e28 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -466,7 +466,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
 
mutex_init(dmic-mutex);
 
-   dmic-fclk = clk_get(dmic-dev, fck);
+   dmic-fclk = devm_clk_get(dmic-dev, fck);
if (IS_ERR(dmic-fclk)) {
dev_err(dmic-dev, cant get fck\n);
return -ENODEV;
@@ -475,8 +475,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, dma);
if (!res) {
dev_err(dmic-dev, invalid dma memory resource\n);
-   ret = -ENODEV;
-   goto err_put_clk;
+   return -ENODEV;
}
dmic-dma_data.addr = res-start + OMAP_DMIC_DATA_REG;
 
@@ -484,34 +483,19 @@ static int asoc_dmic_probe(struct platform_device *pdev)
 
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, mpu);
dmic-io_base = devm_ioremap_resource(pdev-dev, res);
-   if (IS_ERR(dmic-io_base)) {
-   ret = PTR_ERR(dmic-io_base);
-   goto err_put_clk;
-   }
+   if (IS_ERR(dmic-io_base))
+   return PTR_ERR(dmic-io_base);
 
 
ret = devm_snd_soc_register_component(pdev-dev,
  omap_dmic_component,
  omap_dmic_dai, 1);
if (ret)
-   goto err_put_clk;
+   return ret;
 
ret = omap_pcm_platform_register(pdev-dev);
if (ret)
-   goto err_put_clk;
-
-   return 0;
-
-err_put_clk:
-   clk_put(dmic-fclk);
-   return ret;
-}
-
-static int asoc_dmic_remove(struct platform_device *pdev)
-{
-   struct omap_dmic *dmic = platform_get_drvdata(pdev);
-
-   clk_put(dmic-fclk);
+   return ret;
 
return 0;
 }
@@ -529,7 +513,6 @@ static struct platform_driver asoc_dmic_driver = {
.of_match_table = omap_dmic_of_match,
},
.probe = asoc_dmic_probe,
-   .remove = asoc_dmic_remove,
 };
 
 module_platform_driver(asoc_dmic_driver);
-- 
1.9.1

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html