Merge branches 'release', 'button-sysfs', 'misc', 'mismatch', 'randconfig' and 'toshi...
authorLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:49 +0000 (01:59 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:49 +0000 (01:59 -0400)
1  2  3  4  5  6 
drivers/acpi/processor_core.c
drivers/acpi/video.c
drivers/misc/acer-wmi.c

index d9316ab66347c9065e520512581dcf6d6adc6ecf,a3cc8a98255cf724248c7efbf749a912bc9ef4f1,3501cb53857be066077663ed63f3fa2a1d670af2,d3cc07fa4480fc7e09fda5099af8270cf82c2b49,a3cc8a98255cf724248c7efbf749a912bc9ef4f1,a3cc8a98255cf724248c7efbf749a912bc9ef4f1..36a68fa114e3e7b97b85585e40e3f74929110d79
@@@@@@@ -670,26 -670,26 -670,26 -670,21 -670,26 -670,26 +670,26 @@@@@@@ static int __cpuinit acpi_processor_sta
      
        pr->cdev = thermal_cooling_device_register("Processor", device,
                                                &processor_cooling_ops);
   -    if (pr->cdev)
   +    if (IS_ERR(pr->cdev)) {
   +            result = PTR_ERR(pr->cdev);
   +            goto end;
   +    }
   +    if (pr->cdev) {
                printk(KERN_INFO PREFIX
                        "%s is registered as cooling_device%d\n",
                        device->dev.bus_id, pr->cdev->id);
   -    else
   -            goto end;
      
   -    result = sysfs_create_link(&device->dev.kobj, &pr->cdev->device.kobj,
   -                                    "thermal_cooling");
   -    if (result)
   -            return result;
   -    result = sysfs_create_link(&pr->cdev->device.kobj, &device->dev.kobj,
   -                                    "device");
   -    if (result)
   -            return result;
   +            result = sysfs_create_link(&device->dev.kobj,
   +                                       &pr->cdev->device.kobj,
   +                                       "thermal_cooling");
   +            if (result)
   +                    return result;
   +            result = sysfs_create_link(&pr->cdev->device.kobj,
   +                                       &device->dev.kobj,
   +                                       "device");
   +            if (result)
   +                    return result;
   +    }
      
        if (pr->flags.throttling) {
                printk(KERN_INFO PREFIX "%s [%s] (supports",
@@@@@@@ -814,12 -814,12 -814,12 -809,10 -814,12 -814,12 +814,12 @@@@@@@ static int acpi_processor_remove(struc
      
        acpi_processor_remove_fs(device);
      
   -    sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
   -    sysfs_remove_link(&pr->cdev->device.kobj, "device");
   -    thermal_cooling_device_unregister(pr->cdev);
   -    pr->cdev = NULL;
   +    if (pr->cdev) {
   +            sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
   +            sysfs_remove_link(&pr->cdev->device.kobj, "device");
   +            thermal_cooling_device_unregister(pr->cdev);
   +            pr->cdev = NULL;
   +    }
      
        processors[pr->id] = NULL;
      
       *        Acpi processor hotplug support                                      *
       ****************************************************************************/
      
   -  static int is_processor_present(acpi_handle handle);
   -  
      static int is_processor_present(acpi_handle handle)
      {
        acpi_status status;
      
      
        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
 -----  /*
 -----   * if a processor object does not have an _STA object,
 -----   * OSPM assumes that the processor is present.
 -----   */
 -----  if (status == AE_NOT_FOUND)
 -----          return 1;
      
        if (ACPI_SUCCESS(status) && (sta & ACPI_STA_DEVICE_PRESENT))
                return 1;
      
 -----  ACPI_EXCEPTION((AE_INFO, status, "Processor Device is not present"));
 +++++  /*
 +++++   * _STA is mandatory for a processor that supports hot plug
 +++++   */
 +++++  if (status == AE_NOT_FOUND)
 +++++          ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 +++++                          "Processor does not support hot plug\n"));
 +++++  else
 +++++          ACPI_EXCEPTION((AE_INFO, status,
 +++++                          "Processor Device is not present"));
        return 0;
      }
      
@@@@@@@ -888,8 -886,8 -886,8 -881,8 -886,8 -886,8 +888,8 @@@@@@@ int acpi_processor_device_add(acpi_hand
        return 0;
      }
      
--- --static void
--- --acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
+++ ++static void __ref acpi_processor_hotplug_notify(acpi_handle handle,
+++ ++                                          u32 event, void *data)
      {
        struct acpi_processor *pr;
        struct acpi_device *device = NULL;
        switch (event) {
        case ACPI_NOTIFY_BUS_CHECK:
        case ACPI_NOTIFY_DEVICE_CHECK:
-- ---          printk("Processor driver received %s event\n",
++ +++          ACPI_DEBUG_PRINT((ACPI_DB_INFO,
++ +++          "Processor driver received %s event\n",
                       (event == ACPI_NOTIFY_BUS_CHECK) ?
-- ---                 "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
++ +++                 "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK"));
      
                if (!is_processor_present(handle))
                        break;
diff --combined drivers/acpi/video.c
index ace958cb3894f583f3d0abb34893167dd04d501f,12cce69b5441e98a7bd8da23031dc250daaa88f1,d64a142e5e10a6b9526a29950a717db575194be8,7f714fa2a4547d284323d85441e60a9c6b61600f,12cce69b5441e98a7bd8da23031dc250daaa88f1,12cce69b5441e98a7bd8da23031dc250daaa88f1..1bc0c74f2755d1c3bbf8264c01a27dbd208ce227
@@@@@@@ -713,7 -713,7 -713,7 -713,7 -713,7 -713,7 +713,7 @@@@@@@ static void acpi_video_device_find_cap(
      
        kfree(obj);
      
 -----  if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
 +++++  if (device->cap._BCL && device->cap._BCM && max_level > 0) {
                int result;
                static int count = 0;
                char *name;
      
                device->cdev = thermal_cooling_device_register("LCD",
                                        device->dev, &video_cooling_ops);
   +            if (IS_ERR(device->cdev))
   +                    return;
   +  
                if (device->cdev) {
                        printk(KERN_INFO PREFIX
                                "%s is registered as cooling_device%d\n",
@@@@@@@ -1201,7 -1201,7 -1201,7 -1198,7 -1201,7 -1201,7 +1201,7 @@@@@@@ static int acpi_video_bus_ROM_seq_show(
        if (!video)
                goto end;
      
-- ---  printk(KERN_INFO PREFIX "Please implement %s\n", __FUNCTION__);
++ +++  printk(KERN_INFO PREFIX "Please implement %s\n", __func__);
        seq_printf(seq, "<TODO>\n");
      
            end:
diff --combined drivers/misc/acer-wmi.c
index 74d12b4a3abdae48be072857ec75a34c90496dcb,74d12b4a3abdae48be072857ec75a34c90496dcb,74d12b4a3abdae48be072857ec75a34c90496dcb,cdc733b77fe3972de76d517434943c3d7de77a06,74d12b4a3abdae48be072857ec75a34c90496dcb,74d12b4a3abdae48be072857ec75a34c90496dcb..cf71e312b5cb05f45f3eb2165400a922591542a2
@@@@@@@ -271,15 -271,15 -271,15 -271,6 -271,15 -271,15 +271,15 @@@@@@@ static struct dmi_system_id acer_quirks
                },
                .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",
@@@@@@@ -765,7 -765,7 -765,7 -756,7 -765,7 -765,7 +765,7 @@@@@@@ static struct led_classdev mail_led = 
        .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 -798,7 -798,7 -789,7 -798,7 -798,7 +798,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);
      }