Commit da1a64f8 authored by Russell King's avatar Russell King Committed by Daniel Lezcano

cpuidle: mvebu: clean up multiple platform drivers

There's no need to use multiple platform drivers, especially when we
want to do something different in the probe, but we still use a common
probe function.

We can use the platform ID system to only register one platform driver,
but have it match several devices, and give us the CPU idle driver via
the ID's driver_data.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 7379047d
...@@ -99,44 +99,39 @@ static struct cpuidle_driver armada38x_idle_driver = { ...@@ -99,44 +99,39 @@ static struct cpuidle_driver armada38x_idle_driver = {
static int mvebu_v7_cpuidle_probe(struct platform_device *pdev) static int mvebu_v7_cpuidle_probe(struct platform_device *pdev)
{ {
mvebu_v7_cpu_suspend = pdev->dev.platform_data; const struct platform_device_id *id = pdev->id_entry;
if (!strcmp(pdev->dev.driver->name, "cpuidle-armada-xp")) if (!id)
return cpuidle_register(&armadaxp_idle_driver, NULL);
else if (!strcmp(pdev->dev.driver->name, "cpuidle-armada-370"))
return cpuidle_register(&armada370_idle_driver, NULL);
else if (!strcmp(pdev->dev.driver->name, "cpuidle-armada-38x"))
return cpuidle_register(&armada38x_idle_driver, NULL);
else
return -EINVAL; return -EINVAL;
}
static struct platform_driver armadaxp_cpuidle_plat_driver = { mvebu_v7_cpu_suspend = pdev->dev.platform_data;
.driver = {
.name = "cpuidle-armada-xp",
},
.probe = mvebu_v7_cpuidle_probe,
};
module_platform_driver(armadaxp_cpuidle_plat_driver); return cpuidle_register((struct cpuidle_driver *)id->driver_data, NULL);
}
static struct platform_driver armada370_cpuidle_plat_driver = { static const struct platform_device_id mvebu_cpuidle_ids[] = {
.driver = { {
.name = "cpuidle-armada-xp",
.driver_data = (unsigned long)&armadaxp_idle_driver,
}, {
.name = "cpuidle-armada-370", .name = "cpuidle-armada-370",
.driver_data = (unsigned long)&armada370_idle_driver,
}, {
.name = "cpuidle-armada-38x",
.driver_data = (unsigned long)&armada38x_idle_driver,
}, },
.probe = mvebu_v7_cpuidle_probe, {}
}; };
module_platform_driver(armada370_cpuidle_plat_driver); static struct platform_driver mvebu_cpuidle_driver = {
.probe = mvebu_v7_cpuidle_probe,
static struct platform_driver armada38x_cpuidle_plat_driver = {
.driver = { .driver = {
.name = "cpuidle-armada-38x", .name = "cpuidle-mbevu",
}, },
.probe = mvebu_v7_cpuidle_probe, .id_table = mvebu_cpuidle_ids,
}; };
module_platform_driver(armada38x_cpuidle_plat_driver); module_platform_driver(mvebu_cpuidle_driver);
MODULE_AUTHOR("Gregory CLEMENT <gregory.clement@free-electrons.com>"); MODULE_AUTHOR("Gregory CLEMENT <gregory.clement@free-electrons.com>");
MODULE_DESCRIPTION("Marvell EBU v7 cpuidle driver"); MODULE_DESCRIPTION("Marvell EBU v7 cpuidle driver");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment