[PATCH] spi: omap-uwire: use devm_ functions

[PATCH] spi: omap-uwire: use devm_ functions

[Himangi Saraogi]

This patch introduces the use of devm_clk_get and devm_ioremap instead
of the unmanaged interfaces and removes the corresponding free function
calls.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
---
 drivers/spi/spi-omap-uwire.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index 0f5a0aa..cbf67f9 100644
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -447,7 +447,6 @@ static void uwire_off(struct uwire_spi *uwire)
 {
 	uwire_write_reg(UWIRE_SR3, 0);
 	clk_disable(uwire->ck);
-	clk_put(uwire->ck);
 	spi_master_put(uwire->bitbang.master);
 }
 
@@ -463,7 +462,7 @@ static int uwire_probe(struct platform_device *pdev)
 
 	uwire = spi_master_get_devdata(master);
 
-	uwire_base = ioremap(UWIRE_BASE_PHYS, UWIRE_IO_SIZE);
+	uwire_base = devm_ioremap(&pdev->dev, UWIRE_BASE_PHYS, UWIRE_IO_SIZE);
 	if (!uwire_base) {
 		dev_dbg(&pdev->dev, "can't ioremap UWIRE\n");
 		spi_master_put(master);
@@ -472,12 +471,11 @@ static int uwire_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, uwire);
 
-	uwire->ck = clk_get(&pdev->dev, "fck");
+	uwire->ck = devm_clk_get(&pdev->dev, "fck");
 	if (IS_ERR(uwire->ck)) {
 		status = PTR_ERR(uwire->ck);
 		dev_dbg(&pdev->dev, "no functional clock?\n");
 		spi_master_put(master);
-		iounmap(uwire_base);
 		return status;
 	}
 	clk_enable(uwire->ck);
@@ -507,7 +505,6 @@ static int uwire_probe(struct platform_device *pdev)
 	status = spi_bitbang_start(&uwire->bitbang);
 	if (status < 0) {
 		uwire_off(uwire);
-		iounmap(uwire_base);
 	}
 	return status;
 }
@@ -520,7 +517,6 @@ static int uwire_remove(struct platform_device *pdev)
 
 	spi_bitbang_stop(&uwire->bitbang);
 	uwire_off(uwire);
-	iounmap(uwire_base);
 	return 0;
 }
 
-- 
1.9.1

Re: [PATCH] spi: omap-uwire: use devm_ functions

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

On Sat, Jun 21, 2014 at 02:08:58AM +0530, Himangi Saraogi wrote:
> This patch introduces the use of devm_clk_get and devm_ioremap instead
> of the unmanaged interfaces and removes the corresponding free function
> calls.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH] spi: omap-uwire: fix compilation failure

[Olof Johansson]

Patch 'spi: omap-uwire: use devm_ functions' (b3f6a57506b8) introduced a
build error due to a missing include file. Add it.

Cc: Himangi Saraogi <himangi774@gmail.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Olof Johansson <olof@lixom.net>

---
 drivers/spi/spi-omap-uwire.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index cbf67f9..a05359c 100644
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -38,6 +38,7 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
-- 
1.7.10.4

Re: [PATCH] spi: omap-uwire: fix compilation failure

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

On Thu, Jun 26, 2014 at 11:07:38PM -0700, Olof Johansson wrote:
> Patch 'spi: omap-uwire: use devm_ functions' (b3f6a57506b8) introduced a
> build error due to a missing include file. Add it.

A similar patch was applied a few days ago.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] spi: omap-uwire: fix compilation failure

[Olof Johansson]

On Fri, Jun 27, 2014 at 2:03 AM, Mark Brown <broonie@kernel.org> wrote:
> On Thu, Jun 26, 2014 at 11:07:38PM -0700, Olof Johansson wrote:
>> Patch 'spi: omap-uwire: use devm_ functions' (b3f6a57506b8) introduced a
>> build error due to a missing include file. Add it.
>
> A similar patch was applied a few days ago.

Ah, cool. I've seen the build breakage a couple of days including last
night's next and I didn't notice a patch for it based on a quick
search.

http://arm-soc.lixom.net/buildlogs/next/next-20140627/buildall.arm.omap1_defconfig.log.failed
http://arm-soc.lixom.net/buildlogs/next/next-20140626/buildall.arm.omap1_defconfig.log.failed


-Olof