[POWERPC] Fix windfarm platform device usage

The windfarm code uses a struct device_driver instead of
platform_driver, which can cause crashes if any of the callbacks are
called (like on module removal). This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt
2006-10-10 11:47:31 +10:00
committed by Paul Mackerras
szülő 9f2545c118
commit 10270613fb
3 fájl változott, egészen pontosan 30 új sor hozzáadva és 36 régi sor törölve

Fájl megtekintése

@@ -63,8 +63,6 @@
*/
#undef HACKED_OVERTEMP
static struct device *wf_smu_dev;
/* Controls & sensors */
static struct wf_sensor *sensor_cpu_power;
static struct wf_sensor *sensor_cpu_temp;
@@ -641,16 +639,14 @@ static int wf_init_pm(void)
return 0;
}
static int wf_smu_probe(struct device *ddev)
static int wf_smu_probe(struct platform_device *ddev)
{
wf_smu_dev = ddev;
wf_register_client(&wf_smu_events);
return 0;
}
static int wf_smu_remove(struct device *ddev)
static int __devexit wf_smu_remove(struct platform_device *ddev)
{
wf_unregister_client(&wf_smu_events);
@@ -698,16 +694,16 @@ static int wf_smu_remove(struct device *ddev)
if (wf_smu_cpu_fans)
kfree(wf_smu_cpu_fans);
wf_smu_dev = NULL;
return 0;
}
static struct device_driver wf_smu_driver = {
.name = "windfarm",
.bus = &platform_bus_type,
static struct platform_driver wf_smu_driver = {
.probe = wf_smu_probe,
.remove = wf_smu_remove,
.remove = __devexit_p(wf_smu_remove),
.driver = {
.name = "windfarm",
.bus = &platform_bus_type,
},
};
@@ -725,7 +721,7 @@ static int __init wf_smu_init(void)
request_module("windfarm_lm75_sensor");
#endif /* MODULE */
driver_register(&wf_smu_driver);
platform_driver_register(&wf_smu_driver);
}
return rc;
@@ -734,7 +730,7 @@ static int __init wf_smu_init(void)
static void __exit wf_smu_exit(void)
{
driver_unregister(&wf_smu_driver);
platform_driver_unregister(&wf_smu_driver);
}