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-fsl-ftm.c
diff --git
a/drivers/pwm/pwm-fsl-ftm.c
b/drivers/pwm/pwm-fsl-ftm.c
index
96ccd77
..
0247757
100644
(file)
--- a/
drivers/pwm/pwm-fsl-ftm.c
+++ b/
drivers/pwm/pwm-fsl-ftm.c
@@
-453,7
+453,7
@@
static int fsl_pwm_probe(struct platform_device *pdev)
fpc->chip.ops = &fsl_pwm_ops;
fpc->chip.npwm = 8;
fpc->chip.ops = &fsl_pwm_ops;
fpc->chip.npwm = 8;
- ret =
pwmchip_add(
&fpc->chip);
+ ret =
devm_pwmchip_add(&pdev->dev,
&fpc->chip);
if (ret < 0) {
dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);
return ret;
if (ret < 0) {
dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);
return ret;
@@
-464,13
+464,6
@@
static int fsl_pwm_probe(struct platform_device *pdev)
return fsl_pwm_init(fpc);
}
return fsl_pwm_init(fpc);
}
-static int fsl_pwm_remove(struct platform_device *pdev)
-{
- struct fsl_pwm_chip *fpc = platform_get_drvdata(pdev);
-
- return pwmchip_remove(&fpc->chip);
-}
-
#ifdef CONFIG_PM_SLEEP
static int fsl_pwm_suspend(struct device *dev)
{
#ifdef CONFIG_PM_SLEEP
static int fsl_pwm_suspend(struct device *dev)
{
@@
-552,7
+545,6
@@
static struct platform_driver fsl_pwm_driver = {
.pm = &fsl_pwm_pm_ops,
},
.probe = fsl_pwm_probe,
.pm = &fsl_pwm_pm_ops,
},
.probe = fsl_pwm_probe,
- .remove = fsl_pwm_remove,
};
module_platform_driver(fsl_pwm_driver);
};
module_platform_driver(fsl_pwm_driver);