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 tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
drivers
/
pwm
/
pwm-intel-lgm.c
diff --git
a/drivers/pwm/pwm-intel-lgm.c
b/drivers/pwm/pwm-intel-lgm.c
index
015f5eb
..
b66c350
100644
(file)
--- a/
drivers/pwm/pwm-intel-lgm.c
+++ b/
drivers/pwm/pwm-intel-lgm.c
@@
-176,8
+176,6
@@
static int lgm_pwm_probe(struct platform_device *pdev)
if (!pc)
return -ENOMEM;
if (!pc)
return -ENOMEM;
- platform_set_drvdata(pdev, pc);
-
io_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(io_base))
return PTR_ERR(io_base);
io_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(io_base))
return PTR_ERR(io_base);
@@
-210,20
+208,13
@@
static int lgm_pwm_probe(struct platform_device *pdev)
lgm_pwm_init(pc);
lgm_pwm_init(pc);
- ret =
pwmchip_add(
&pc->chip);
+ ret =
devm_pwmchip_add(dev,
&pc->chip);
if (ret < 0)
return dev_err_probe(dev, ret, "failed to add PWM chip\n");
return 0;
}
if (ret < 0)
return dev_err_probe(dev, ret, "failed to add PWM chip\n");
return 0;
}
-static int lgm_pwm_remove(struct platform_device *pdev)
-{
- struct lgm_pwm_chip *pc = platform_get_drvdata(pdev);
-
- return pwmchip_remove(&pc->chip);
-}
-
static const struct of_device_id lgm_pwm_of_match[] = {
{ .compatible = "intel,lgm-pwm" },
{ }
static const struct of_device_id lgm_pwm_of_match[] = {
{ .compatible = "intel,lgm-pwm" },
{ }
@@
-236,7
+227,6
@@
static struct platform_driver lgm_pwm_driver = {
.of_match_table = lgm_pwm_of_match,
},
.probe = lgm_pwm_probe,
.of_match_table = lgm_pwm_of_match,
},
.probe = lgm_pwm_probe,
- .remove = lgm_pwm_remove,
};
module_platform_driver(lgm_pwm_driver);
};
module_platform_driver(lgm_pwm_driver);