projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mmc-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
[linux-block.git]
/
drivers
/
bus
/
simple-pm-bus.c
diff --git
a/drivers/bus/simple-pm-bus.c
b/drivers/bus/simple-pm-bus.c
index aafcc481de91deff63daaf8b55b6c8dd415ad786..50870c8278899269f962943db3f328eb4bccc180 100644
(file)
--- a/
drivers/bus/simple-pm-bus.c
+++ b/
drivers/bus/simple-pm-bus.c
@@
-74,17
+74,16
@@
static int simple_pm_bus_probe(struct platform_device *pdev)
return 0;
}
return 0;
}
-static
int
simple_pm_bus_remove(struct platform_device *pdev)
+static
void
simple_pm_bus_remove(struct platform_device *pdev)
{
const void *data = of_device_get_match_data(&pdev->dev);
if (pdev->driver_override || data)
{
const void *data = of_device_get_match_data(&pdev->dev);
if (pdev->driver_override || data)
- return
0
;
+ return;
dev_dbg(&pdev->dev, "%s\n", __func__);
pm_runtime_disable(&pdev->dev);
dev_dbg(&pdev->dev, "%s\n", __func__);
pm_runtime_disable(&pdev->dev);
- return 0;
}
static int simple_pm_bus_runtime_suspend(struct device *dev)
}
static int simple_pm_bus_runtime_suspend(struct device *dev)
@@
-129,7
+128,7
@@
MODULE_DEVICE_TABLE(of, simple_pm_bus_of_match);
static struct platform_driver simple_pm_bus_driver = {
.probe = simple_pm_bus_probe,
static struct platform_driver simple_pm_bus_driver = {
.probe = simple_pm_bus_probe,
- .remove = simple_pm_bus_remove,
+ .remove
_new
= simple_pm_bus_remove,
.driver = {
.name = "simple-pm-bus",
.of_match_table = simple_pm_bus_of_match,
.driver = {
.name = "simple-pm-bus",
.of_match_table = simple_pm_bus_of_match,