Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / drivers / staging / iio / adc / lpc32xx_adc.c

diff --git a/drivers/staging/iio/adc/lpc32xx_adc.c b/drivers/staging/iio/adc/lpc32xx_adc.c
index 7e9bd0001cc7f9d1c239faf578e8b557d7c2cb01..0bf2a6cc79e0507ac93b546306f4fb1d488d09a6 100644 (file)
--- a/drivers/staging/iio/adc/lpc32xx_adc.c
+++ b/drivers/staging/iio/adc/lpc32xx_adc.c
@@ -126,7 +126,7 @@ static irqreturn_t lpc32xx_adc_isr(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static int __devinit lpc32xx_adc_probe(struct platform_device *pdev)
+static int lpc32xx_adc_probe(struct platform_device *pdev)
 {
        struct lpc32xx_adc_info *info = NULL;
        struct resource *res;
@@ -150,7 +150,7 @@ static int __devinit lpc32xx_adc_probe(struct platform_device *pdev)
 
        info = iio_priv(iodev);
 
-       info->adc_base = ioremap(res->start, res->end - res->start + 1);
+       info->adc_base = ioremap(res->start, resource_size(res));
        if (!info->adc_base) {
                dev_err(&pdev->dev, "failed mapping memory\n");
                retval = -EBUSY;
@@ -207,7 +207,7 @@ errout1:
        return retval;
 }
 
-static int __devexit lpc32xx_adc_remove(struct platform_device *pdev)
+static int lpc32xx_adc_remove(struct platform_device *pdev)
 {
        struct iio_dev *iodev = platform_get_drvdata(pdev);
        struct lpc32xx_adc_info *info = iio_priv(iodev);
@@ -233,7 +233,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_adc_match);
 
 static struct platform_driver lpc32xx_adc_driver = {
        .probe          = lpc32xx_adc_probe,
-       .remove         = __devexit_p(lpc32xx_adc_remove),
+       .remove         = lpc32xx_adc_remove,
        .driver         = {
                .name   = MOD_NAME,
                .owner  = THIS_MODULE,