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

Commit 2ee8e6f0 authored by Eunki Kim's avatar Eunki Kim Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: use devm_ functions for ADC driver 



This patch uses devm_* functions for probe function in ADC driver.
It reduces code size and simplifies the code.

Signed-off-by: default avatarEunki Kim <eunki_kim@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 559a67db

arch/arm/plat-samsung/adc.c

+13 −35
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int s3c_adc_probe(struct platform_device *pdev) 
	int ret;

	unsigned tmp;



	adc = kzalloc(sizeof(struct adc_device), GFP_KERNEL);

	adc = devm_kzalloc(dev, sizeof(struct adc_device), GFP_KERNEL);

	if (adc == NULL) {

		dev_err(dev, "failed to allocate adc_device\n");

		return -ENOMEM;
@@ -355,50 +355,46 @@ static int s3c_adc_probe(struct platform_device *pdev) 
	adc->pdev = pdev;

	adc->prescale = S3C2410_ADCCON_PRSCVL(49);



	adc->vdd = regulator_get(dev, "vdd");

	adc->vdd = devm_regulator_get(dev, "vdd");

	if (IS_ERR(adc->vdd)) {

		dev_err(dev, "operating without regulator \"vdd\" .\n");

		ret = PTR_ERR(adc->vdd);

		goto err_alloc;

		return PTR_ERR(adc->vdd);

	}



	adc->irq = platform_get_irq(pdev, 1);

	if (adc->irq <= 0) {

		dev_err(dev, "failed to get adc irq\n");

		ret = -ENOENT;

		goto err_reg;

		return -ENOENT;

	}



	ret = request_irq(adc->irq, s3c_adc_irq, 0, dev_name(dev), adc);

	ret = devm_request_irq(dev, adc->irq, s3c_adc_irq, 0, dev_name(dev),

				adc);

	if (ret < 0) {

		dev_err(dev, "failed to attach adc irq\n");

		goto err_reg;

		return ret;

	}



	adc->clk = clk_get(dev, "adc");

	adc->clk = devm_clk_get(dev, "adc");

	if (IS_ERR(adc->clk)) {

		dev_err(dev, "failed to get adc clock\n");

		ret = PTR_ERR(adc->clk);

		goto err_irq;

		return PTR_ERR(adc->clk);

	}



	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!regs) {

		dev_err(dev, "failed to find registers\n");

		ret = -ENXIO;

		goto err_clk;

		return -ENXIO;

	}



	adc->regs = ioremap(regs->start, resource_size(regs));

	adc->regs = devm_request_and_ioremap(dev, regs);

	if (!adc->regs) {

		dev_err(dev, "failed to map registers\n");

		ret = -ENXIO;

		goto err_clk;

		return -ENXIO;

	}



	ret = regulator_enable(adc->vdd);

	if (ret)

		goto err_ioremap;

		return ret;



	clk_enable(adc->clk);
@@ -418,32 +414,14 @@ static int s3c_adc_probe(struct platform_device *pdev) 
	adc_dev = adc;



	return 0;



 err_ioremap:

	iounmap(adc->regs);

 err_clk:

	clk_put(adc->clk);



 err_irq:

	free_irq(adc->irq, adc);

 err_reg:

	regulator_put(adc->vdd);

 err_alloc:

	kfree(adc);

	return ret;

}



static int __devexit s3c_adc_remove(struct platform_device *pdev)

{

	struct adc_device *adc = platform_get_drvdata(pdev);



	iounmap(adc->regs);

	free_irq(adc->irq, adc);

	clk_disable(adc->clk);

	regulator_disable(adc->vdd);

	regulator_put(adc->vdd);

	clk_put(adc->clk);

	kfree(adc);



	return 0;

}