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

Commit e6854e02 authored by Ladislav Michl's avatar Ladislav Michl Committed by Boris Brezillon
Browse files

mtd: onenand: omap2: Remove regulator support 



As no platform data user sets regulator_can_sleep, regulator code is
no-op and can be deleted.

Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Reviewed-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Acked-by: default avatarRoger Quadros <rogerq@ti.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent d36005d4

drivers/mtd/onenand/omap2.c

+1 −41
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <linux/dma-mapping.h>

#include <linux/io.h>

#include <linux/slab.h>

#include <linux/regulator/consumer.h>

#include <linux/gpio.h>



#include <asm/mach/flash.h>
@@ -59,7 +58,6 @@ struct omap2_onenand { 
	int dma_channel;

	int freq;

	int (*setup)(void __iomem *base, int *freq_ptr);

	struct regulator *regulator;

	u8 flags;

};
@@ -583,30 +581,6 @@ static void omap2_onenand_shutdown(struct platform_device *pdev) 
	memset((__force void *)c->onenand.base, 0, ONENAND_BUFRAM_SIZE);

}



static int omap2_onenand_enable(struct mtd_info *mtd)

{

	int ret;

	struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd);



	ret = regulator_enable(c->regulator);

	if (ret != 0)

		dev_err(&c->pdev->dev, "can't enable regulator\n");



	return ret;

}



static int omap2_onenand_disable(struct mtd_info *mtd)

{

	int ret;

	struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd);



	ret = regulator_disable(c->regulator);

	if (ret != 0)

		dev_err(&c->pdev->dev, "can't disable regulator\n");



	return ret;

}



static int omap2_onenand_probe(struct platform_device *pdev)

{

	struct omap_onenand_platform_data *pdata;
@@ -726,22 +700,11 @@ static int omap2_onenand_probe(struct platform_device *pdev) 
		}

	}



	if (pdata->regulator_can_sleep) {

		c->regulator = regulator_get(&pdev->dev, "vonenand");

		if (IS_ERR(c->regulator)) {

			dev_err(&pdev->dev,  "Failed to get regulator\n");

			r = PTR_ERR(c->regulator);

			goto err_release_dma;

		}

		c->onenand.enable = omap2_onenand_enable;

		c->onenand.disable = omap2_onenand_disable;

	}



	if (pdata->skip_initial_unlocking)

		this->options |= ONENAND_SKIP_INITIAL_UNLOCKING;



	if ((r = onenand_scan(&c->mtd, 1)) < 0)

		goto err_release_regulator;

		goto err_release_dma;



	r = mtd_device_register(&c->mtd, pdata ? pdata->parts : NULL,

				pdata ? pdata->nr_parts : 0);
@@ -754,8 +717,6 @@ static int omap2_onenand_probe(struct platform_device *pdev) 


err_release_onenand:

	onenand_release(&c->mtd);

err_release_regulator:

	regulator_put(c->regulator);

err_release_dma:

	if (c->dma_channel != -1)

		omap_free_dma(c->dma_channel);
@@ -779,7 +740,6 @@ static int omap2_onenand_remove(struct platform_device *pdev) 
	struct omap2_onenand *c = dev_get_drvdata(&pdev->dev);



	onenand_release(&c->mtd);

	regulator_put(c->regulator);

	if (c->dma_channel != -1)

		omap_free_dma(c->dma_channel);

	omap2_onenand_shutdown(pdev);