Merge tag 'for-linus-2' of git://git.code.sf.net/p/openipmi/linux-ipmi

[cascardo/linux.git] / drivers / platform / x86 / fujitsu-laptop.c

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 87aa28c..7c21c1c 100644 (file)
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -559,7 +559,6 @@ static struct attribute_group fujitsupf_attribute_group = {
 static struct platform_driver fujitsupf_driver = {
        .driver = {
                   .name = "fujitsu-laptop",
-                  .owner = THIS_MODULE,
                   }
 };
 
@@ -1050,6 +1049,13 @@ static struct acpi_driver acpi_fujitsu_hotkey_driver = {
                },
 };
 
+static const struct acpi_device_id fujitsu_ids[] __used = {
+       {ACPI_FUJITSU_HID, 0},
+       {ACPI_FUJITSU_HOTKEY_HID, 0},
+       {"", 0}
+};
+MODULE_DEVICE_TABLE(acpi, fujitsu_ids);
+
 static int __init fujitsu_init(void)
 {
        int ret, result, max_brightness;
@@ -1147,8 +1153,7 @@ fail_hotkey1:
 fail_hotkey:
        platform_driver_unregister(&fujitsupf_driver);
 fail_backlight:
-       if (fujitsu->bl_device)
-               backlight_device_unregister(fujitsu->bl_device);
+       backlight_device_unregister(fujitsu->bl_device);
 fail_sysfs_group:
        sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
                           &fujitsupf_attribute_group);
@@ -1172,8 +1177,7 @@ static void __exit fujitsu_cleanup(void)
 
        platform_driver_unregister(&fujitsupf_driver);
 
-       if (fujitsu->bl_device)
-               backlight_device_unregister(fujitsu->bl_device);
+       backlight_device_unregister(fujitsu->bl_device);
 
        sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
                           &fujitsupf_attribute_group);
@@ -1208,12 +1212,3 @@ MODULE_LICENSE("GPL");
 MODULE_ALIAS("dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1D3:*:cvrS6410:*");
 MODULE_ALIAS("dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1E6:*:cvrS6420:*");
 MODULE_ALIAS("dmi:*:svnFUJITSU:*:pvr:rvnFUJITSU:rnFJNB19C:*:cvrS7020:*");
-
-static struct pnp_device_id pnp_ids[] __used = {
-       {.id = "FUJ02bf"},
-       {.id = "FUJ02B1"},
-       {.id = "FUJ02E3"},
-       {.id = ""}
-};
-
-MODULE_DEVICE_TABLE(pnp, pnp_ids);