projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
drivers
/
pwm
/
pwm-rcar.c
diff --git
a/drivers/pwm/pwm-rcar.c
b/drivers/pwm/pwm-rcar.c
index
9daca0c
..
b437192
100644
(file)
--- a/
drivers/pwm/pwm-rcar.c
+++ b/
drivers/pwm/pwm-rcar.c
@@
-241,13
+241,12
@@
static int rcar_pwm_probe(struct platform_device *pdev)
static int rcar_pwm_remove(struct platform_device *pdev)
{
struct rcar_pwm_chip *rcar_pwm = platform_get_drvdata(pdev);
static int rcar_pwm_remove(struct platform_device *pdev)
{
struct rcar_pwm_chip *rcar_pwm = platform_get_drvdata(pdev);
- int ret;
-
ret =
pwmchip_remove(&rcar_pwm->chip);
+ pwmchip_remove(&rcar_pwm->chip);
pm_runtime_disable(&pdev->dev);
pm_runtime_disable(&pdev->dev);
- return
ret
;
+ return
0
;
}
static const struct of_device_id rcar_pwm_of_table[] = {
}
static const struct of_device_id rcar_pwm_of_table[] = {