kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: iio: adc: Replace of_iomap() with devm_ioremap_resource()

Browse source 
The adc driver uses of_iomap() which doesn't request the resource and
isn't device managed so error handling is needed. of_iomap() is mainly
used in cases where there is no driver or struct device so a switch to
devm_ functions is required.

This patch switches to use devm_ioremap_resource() instead which
automatically requests the resource and is freed when the driver
detaches.

Removed the error handling to unmap I/O registers i.e.
iounmap() in probe and remove functions of this driver and
consequently removed an unnecessary label.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Amitoj Kaur Chawla 2016-02-29 13:03:46 +05:30 committed by Greg Kroah-Hartman
parent a04b4e5005
commit 09b9da3399
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/staging/iio/adc/spear_adc.c
View file

@ -262,6 +262,7 @@ static int spear_adc_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct spear_adc_state *st; struct spear_adc_state *st;
struct resource *res;
struct iio_dev *indio_dev = NULL; struct iio_dev *indio_dev = NULL;
int ret = -ENODEV; int ret = -ENODEV;
int irq; int irq;
@ -280,24 +281,24 @@ static int spear_adc_probe(struct platform_device *pdev)
* (e.g. SPEAr3xx). Let's provide two register base addresses * (e.g. SPEAr3xx). Let's provide two register base addresses
* to support multi-arch kernels. * to support multi-arch kernels.
*/ */
st->adc_base_spear6xx = of_iomap(np, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!st->adc_base_spear6xx) { st->adc_base_spear6xx = devm_ioremap_resource(&pdev->dev, res);
dev_err(dev, "failed mapping memory\n"); if (IS_ERR(st->adc_base_spear6xx))
return -ENOMEM; return PTR_ERR(st->adc_base_spear6xx);
}
st->adc_base_spear3xx = st->adc_base_spear3xx =
(struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx; (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;
st->clk = devm_clk_get(dev, NULL); st->clk = devm_clk_get(dev, NULL);
if (IS_ERR(st->clk)) { if (IS_ERR(st->clk)) {
dev_err(dev, "failed getting clock\n"); dev_err(dev, "failed getting clock\n");
goto errout1; return PTR_ERR(st->clk);
} }
ret = clk_prepare_enable(st->clk); ret = clk_prepare_enable(st->clk);
if (ret) { if (ret) {
dev_err(dev, "failed enabling clock\n"); dev_err(dev, "failed enabling clock\n");
goto errout1; return ret;
} }
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
@ -356,8 +357,6 @@ static int spear_adc_probe(struct platform_device *pdev)
errout2: errout2:
clk_disable_unprepare(st->clk); clk_disable_unprepare(st->clk);
errout1:
iounmap(st->adc_base_spear6xx);
return ret; return ret;
} }
@ -368,7 +367,6 @@ static int spear_adc_remove(struct platform_device *pdev)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
clk_disable_unprepare(st->clk); clk_disable_unprepare(st->clk);
iounmap(st->adc_base_spear6xx);
return 0; return 0;
} }