projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
plat-mxc
/
pwm.c
diff --git
a/arch/arm/plat-mxc/pwm.c
b/arch/arm/plat-mxc/pwm.c
index 7a61ef8f471a49fd3ac0b67540f949cf13eaaa43..761c3c940a68cf84aa65e0bbaebd64e999b9ff9c 100644
(file)
--- a/
arch/arm/plat-mxc/pwm.c
+++ b/
arch/arm/plat-mxc/pwm.c
@@
-214,14
+214,14
@@
static int __devinit mxc_pwm_probe(struct platform_device *pdev)
goto err_free_clk;
}
goto err_free_clk;
}
- r = request_mem_region(r->start, r
->end - r->start + 1
, pdev->name);
+ r = request_mem_region(r->start, r
esource_size(r)
, pdev->name);
if (r == NULL) {
dev_err(&pdev->dev, "failed to request memory resource\n");
ret = -EBUSY;
goto err_free_clk;
}
if (r == NULL) {
dev_err(&pdev->dev, "failed to request memory resource\n");
ret = -EBUSY;
goto err_free_clk;
}
- pwm->mmio_base = ioremap(r->start, r
->end - r->start + 1
);
+ pwm->mmio_base = ioremap(r->start, r
esource_size(r)
);
if (pwm->mmio_base == NULL) {
dev_err(&pdev->dev, "failed to ioremap() registers\n");
ret = -ENODEV;
if (pwm->mmio_base == NULL) {
dev_err(&pdev->dev, "failed to ioremap() registers\n");
ret = -ENODEV;
@@
-236,7
+236,7
@@
static int __devinit mxc_pwm_probe(struct platform_device *pdev)
return 0;
err_free_mem:
return 0;
err_free_mem:
- release_mem_region(r->start, r
->end - r->start + 1
);
+ release_mem_region(r->start, r
esource_size(r)
);
err_free_clk:
clk_put(pwm->clk);
err_free:
err_free_clk:
clk_put(pwm->clk);
err_free:
@@
-260,7
+260,7
@@
static int __devexit mxc_pwm_remove(struct platform_device *pdev)
iounmap(pwm->mmio_base);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
iounmap(pwm->mmio_base);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(r->start, r
->end - r->start + 1
);
+ release_mem_region(r->start, r
esource_size(r)
);
clk_put(pwm->clk);
clk_put(pwm->clk);