@@ -1163,14 +1163,13 @@ static int __init alienware_wmi_init(void)
ret = platform_driver_register(&platform_driver);
if (ret)
goto fail_platform_driver;
- platform_device = platform_device_alloc("alienware-wmi", PLATFORM_DEVID_NONE);
- if (!platform_device) {
- ret = -ENOMEM;
+
+ platform_device = platform_device_register_simple("alienware-wmi",
+ PLATFORM_DEVID_NONE, NULL, 0);
+ if (IS_ERR(platform_device)) {
+ ret = PTR_ERR(platform_device);
goto fail_platform_device1;
}
- ret = platform_device_add(platform_device);
- if (ret)
- goto fail_platform_device2;
if (quirks->thermal) {
ret = create_thermal_profile();
@@ -1187,9 +1186,7 @@ static int __init alienware_wmi_init(void)
fail_prep_zones:
remove_thermal_profile();
fail_prep_thermal_profile:
- platform_device_del(platform_device);
-fail_platform_device2:
- platform_device_put(platform_device);
+ platform_device_unregister(platform_device);
fail_platform_device1:
platform_driver_unregister(&platform_driver);
fail_platform_driver: