Merge branches 'release', 'ejd', 'sony' and 'wmi' into release
authorLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
1  2  3  4 
drivers/acpi/scan.c
drivers/misc/acer-wmi.c

diff --combined drivers/acpi/scan.c
index b26e3019e1cc8101c3b7a4a869208ff2dec44eb9,d9b914303b9c0468e9c1dd2f7a41f40b18ffffda,3fac011f9cf964082b463ef20913542ca9bce173,3fac011f9cf964082b463ef20913542ca9bce173..57570ac47803f4d590da5f8254547119ab10aec3
@@@@@ -609,7 -609,8 -609,7 -609,7 +609,8 @@@@@ acpi_bus_get_ejd(acpi_handle handle, ac
        status = acpi_evaluate_object(handle, "_EJD", NULL, &buffer);
        if (ACPI_SUCCESS(status)) {
                obj = buffer.pointer;
- --            status = acpi_get_handle(NULL, obj->string.pointer, ejd);
+ ++            status = acpi_get_handle(ACPI_ROOT_OBJECT, obj->string.pointer,
+ ++                                     ejd);
                kfree(buffer.pointer);
        }
        return status;
@@@@@ -966,7 -967,7 -966,7 -966,7 +967,7 @@@@@ static void acpi_device_set_id(struct a
        case ACPI_BUS_TYPE_DEVICE:
                status = acpi_get_object_info(handle, &buffer);
                if (ACPI_FAILURE(status)) {
 ---                    printk(KERN_ERR PREFIX "%s: Error reading device info\n", __FUNCTION__);
 +++                    printk(KERN_ERR PREFIX "%s: Error reading device info\n", __func__);
                        return;
                }
    
diff --combined drivers/misc/acer-wmi.c
index cf71e312b5cb05f45f3eb2165400a922591542a2,d7aea93081f26f98310ebbb1db6a4e29e1ed7ffb,d7aea93081f26f98310ebbb1db6a4e29e1ed7ffb,05fd9cc42e6682b597384ecda74147dd4d85a6a1..dd13a3749927494804aa4566c59df652d963f40b
@@@@@ -217,6 -217,6 -217,6 -217,15 +217,15 @@@@@ static struct dmi_system_id acer_quirks
                },
                .driver_data = &quirk_acer_travelmate_2490,
        },
+++     {
+++             .callback = dmi_matched,
+++             .ident = "Acer Aspire 3610",
+++             .matches = {
+++                     DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+++                     DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3610"),
+++             },
+++             .driver_data = &quirk_acer_travelmate_2490,
+++     },
        {
                .callback = dmi_matched,
                .ident = "Acer Aspire 5100",
                },
                .driver_data = &quirk_acer_travelmate_2490,
        },
+++     {
+++             .callback = dmi_matched,
+++             .ident = "Acer Aspire 5610",
+++             .matches = {
+++                     DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+++                     DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
+++             },
+++             .driver_data = &quirk_acer_travelmate_2490,
+++     },
        {
                .callback = dmi_matched,
                .ident = "Acer Aspire 5630",
                },
                .driver_data = &quirk_acer_travelmate_2490,
        },
 ++     {
 ++             .callback = dmi_matched,
 ++             .ident = "Acer TravelMate 4200",
 ++             .matches = {
 ++                     DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
 ++                     DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4200"),
 ++             },
 ++             .driver_data = &quirk_acer_travelmate_2490,
 ++     },
        {
                .callback = dmi_matched,
                .ident = "Medion MD 98300",
@@@@@ -761,11 -752,11 -752,11 -779,11 +779,11 @@@@@ enum led_brightness value
    }
    
    static struct led_classdev mail_led = {
---     .name = "acer-mail:green",
+++     .name = "acer-wmi::mail",
        .brightness_set = mail_led_set,
    };
    
 ---static int __init acer_led_init(struct device *dev)
 +++static int __devinit acer_led_init(struct device *dev)
    {
        return led_classdev_register(dev, &mail_led);
    }
@@@@@ -798,7 -789,7 -789,7 -816,7 +816,7 @@@@@ static struct backlight_ops acer_bl_op
        .update_status = update_bl_status,
    };
    
 ---static int __init acer_backlight_init(struct device *dev)
 +++static int __devinit acer_backlight_init(struct device *dev)
    {
        struct backlight_device *bd;
    
        return 0;
    }
    
 ---static void __exit acer_backlight_exit(void)
 +++static void acer_backlight_exit(void)
    {
        backlight_device_unregister(acer_backlight_device);
    }
@@@@@ -1052,11 -1043,11 -1043,11 -1070,12 +1070,12 @@@@@ static int __init acer_wmi_init(void
    
        if (wmi_has_guid(WMID_GUID2) && interface) {
                if (ACPI_FAILURE(WMID_set_capabilities())) {
---                     printk(ACER_ERR "Unable to detect available devices\n");
+++                     printk(ACER_ERR "Unable to detect available WMID "
+++                                     "devices\n");
                        return -ENODEV;
                }
        } else if (!wmi_has_guid(WMID_GUID2) && interface) {
---             printk(ACER_ERR "Unable to detect available devices\n");
+++             printk(ACER_ERR "No WMID device detection method found\n");
                return -ENODEV;
        }
    
                interface = &AMW0_interface;
    
                if (ACPI_FAILURE(AMW0_set_capabilities())) {
---                     printk(ACER_ERR "Unable to detect available devices\n");
+++                     printk(ACER_ERR "Unable to detect available AMW0 "
+++                                     "devices\n");
                        return -ENODEV;
                }
        }
    
---     if (wmi_has_guid(AMW0_GUID1)) {
---             if (ACPI_FAILURE(AMW0_find_mailled()))
---                     printk(ACER_ERR "Unable to detect mail LED\n");
---     }
+++     if (wmi_has_guid(AMW0_GUID1))
+++             AMW0_find_mailled();
    
        find_quirks();
    
        if (!interface) {
---             printk(ACER_ERR "No or unsupported WMI interface, unable to ");
---             printk(KERN_CONT "load.\n");
+++             printk(ACER_ERR "No or unsupported WMI interface, unable to "
+++                             "load\n");
                return -ENODEV;
        }