Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3f6a575 authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Mark Brown
Browse files

spi: omap-uwire: use devm_ functions 



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: default avatarHimangi Saraogi <himangi774@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 7171511e

drivers/spi/spi-omap-uwire.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

}