Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Wed, 30 Apr 2008 18:52:52 +0000 (11:52 -0700)]
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (179 commits)
  ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
  acpi: fix section mismatch warning in pnpacpi
  intel_menlo: fix build warning
  ACPI: Cleanup: Remove unneeded, multiple local dummy variables
  ACPI: video - fix permissions on some proc entries
  ACPI: video - properly handle errors when registering proc elements
  ACPI: video - do not store invalid entries in attached_array list
  ACPI: re-name acpi_pm_ops to acpi_suspend_ops
  ACER_WMI/ASUS_LAPTOP: fix build bug
  thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
  ACPI: check a return value correctly in acpi_power_get_context()
  #if 0 acpi/bay.c:eject_removable_drive()
  eeepc-laptop: add hwmon fan control
  eeepc-laptop: add backlight
  eeepc-laptop: add base driver
  ACPI: thinkpad-acpi: bump up version to 0.20
  ACPI: thinkpad-acpi: fix selects in Kconfig
  ACPI: thinkpad-acpi: use a private workqueue
  ACPI: thinkpad-acpi: fluff really minor fix
  ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
  ...

Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c
manually.

1  2 
MAINTAINERS
drivers/acpi/ec.c
drivers/acpi/fan.c
drivers/acpi/power.c
drivers/acpi/processor_core.c
drivers/acpi/processor_idle.c
drivers/acpi/thermal.c
drivers/acpi/video.c
drivers/pnp/pnpbios/proc.c
include/linux/pnp.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1070,46 -1053,66 +1062,56 @@@ static int acpi_video_device_add_fs(str
        if (!vid_dev)
                return -ENODEV;
  
-       if (!acpi_device_dir(device)) {
-               acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                    vid_dev->video->dir);
-               if (!acpi_device_dir(device))
-                       return -ENODEV;
-               acpi_device_dir(device)->owner = THIS_MODULE;
-       }
+       device_dir = proc_mkdir(acpi_device_bid(device),
+                               vid_dev->video->dir);
+       if (!device_dir)
+               return -ENOMEM;
+       device_dir->owner = THIS_MODULE;
  
        /* 'info' [R] */
 -      entry = create_proc_entry("info", S_IRUGO, device_dir);
 +      entry = proc_create_data("info", S_IRUGO, acpi_device_dir(device),
 +                      &acpi_video_device_info_fops, acpi_driver_data(device));
        if (!entry)
-               return -ENODEV;
+               goto err_remove_dir;
  
 -      entry->proc_fops = &acpi_video_device_info_fops;
 -      entry->data = acpi_driver_data(device);
 -      entry->owner = THIS_MODULE;
 -
        /* 'state' [R/W] */
 -      entry = create_proc_entry("state", S_IFREG | S_IRUGO | S_IWUSR,
 -                                device_dir);
 +      acpi_video_device_state_fops.write = acpi_video_device_write_state;
 +      entry = proc_create_data("state", S_IFREG | S_IRUGO | S_IWUSR,
 +                               acpi_device_dir(device),
 +                               &acpi_video_device_state_fops,
 +                               acpi_driver_data(device));
        if (!entry)
-               return -ENODEV;
+               goto err_remove_info;
  
 -      acpi_video_device_state_fops.write = acpi_video_device_write_state;
 -      entry->proc_fops = &acpi_video_device_state_fops;
 -      entry->data = acpi_driver_data(device);
 -      entry->owner = THIS_MODULE;
 -
        /* 'brightness' [R/W] */
 -      entry = create_proc_entry("brightness", S_IFREG | S_IRUGO | S_IWUSR,
 -                                device_dir);
 +      acpi_video_device_brightness_fops.write =
 +              acpi_video_device_write_brightness;
 +      entry = proc_create_data("brightness", S_IFREG | S_IRUGO | S_IWUSR,
 +                               acpi_device_dir(device),
 +                               &acpi_video_device_brightness_fops,
 +                               acpi_driver_data(device));
        if (!entry)
-               return -ENODEV;
+               goto err_remove_state;
  
 -      acpi_video_device_brightness_fops.write =
 -                      acpi_video_device_write_brightness;
 -      entry->proc_fops = &acpi_video_device_brightness_fops;
 -      entry->data = acpi_driver_data(device);
 -      entry->owner = THIS_MODULE;
 -
        /* 'EDID' [R] */
 -      entry = create_proc_entry("EDID", S_IRUGO, device_dir);
 +      entry = proc_create_data("EDID", S_IRUGO, acpi_device_dir(device),
 +                               &acpi_video_device_EDID_fops,
 +                               acpi_driver_data(device));
        if (!entry)
-               return -ENODEV;
+               goto err_remove_brightness;
 -      entry->proc_fops = &acpi_video_device_EDID_fops;
 -      entry->data = acpi_driver_data(device);
 -      entry->owner = THIS_MODULE;
 -
 -      acpi_device_dir(device) = device_dir;
        return 0;
+  err_remove_brightness:
+       remove_proc_entry("brightness", device_dir);
+  err_remove_state:
+       remove_proc_entry("state", device_dir);
+  err_remove_info:
+       remove_proc_entry("info", device_dir);
+  err_remove_dir:
+       remove_proc_entry(acpi_device_bid(device), vid_dev->video->dir);
+       return -ENOMEM;
  }
  
  static int acpi_video_device_remove_fs(struct acpi_device *device)
@@@ -1331,61 -1336,79 +1335,69 @@@ acpi_video_bus_write_DOS(struct file *f
  
  static int acpi_video_bus_add_fs(struct acpi_device *device)
  {
-       struct proc_dir_entry *entry = NULL;
-       struct acpi_video_bus *video;
+       struct acpi_video_bus *video = acpi_driver_data(device);
+       struct proc_dir_entry *device_dir;
+       struct proc_dir_entry *entry;
  
-       video = acpi_driver_data(device);
+       device_dir = proc_mkdir(acpi_device_bid(device), acpi_video_dir);
+       if (!device_dir)
+               return -ENOMEM;
  
-       if (!acpi_device_dir(device)) {
-               acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                    acpi_video_dir);
-               if (!acpi_device_dir(device))
-                       return -ENODEV;
-               video->dir = acpi_device_dir(device);
-               acpi_device_dir(device)->owner = THIS_MODULE;
-       }
+       device_dir->owner = THIS_MODULE;
  
        /* 'info' [R] */
 -      entry = create_proc_entry("info", S_IRUGO, device_dir);
 +      entry = proc_create_data("info", S_IRUGO, acpi_device_dir(device),
 +                               &acpi_video_bus_info_fops,
 +                               acpi_driver_data(device));
        if (!entry)
-               return -ENODEV;
+               goto err_remove_dir;
  
 -      entry->proc_fops = &acpi_video_bus_info_fops;
 -      entry->data = acpi_driver_data(device);
 -      entry->owner = THIS_MODULE;
 -
        /* 'ROM' [R] */
 -      entry = create_proc_entry("ROM", S_IRUGO, device_dir);
 +      entry = proc_create_data("ROM", S_IRUGO, acpi_device_dir(device),
 +                               &acpi_video_bus_ROM_fops,
 +                               acpi_driver_data(device));
        if (!entry)
-               return -ENODEV;
+               goto err_remove_info;
  
 -      entry->proc_fops = &acpi_video_bus_ROM_fops;
 -      entry->data = acpi_driver_data(device);
 -      entry->owner = THIS_MODULE;
 -
        /* 'POST_info' [R] */
 -      entry = create_proc_entry("POST_info", S_IRUGO, device_dir);
 +      entry = proc_create_data("POST_info", S_IRUGO, acpi_device_dir(device),
 +                               &acpi_video_bus_POST_info_fops,
 +                               acpi_driver_data(device));
        if (!entry)
-               return -ENODEV;
+               goto err_remove_rom;
  
 -      entry->proc_fops = &acpi_video_bus_POST_info_fops;
 -      entry->data = acpi_driver_data(device);
 -      entry->owner = THIS_MODULE;
 -
        /* 'POST' [R/W] */
 -      entry = create_proc_entry("POST", S_IFREG | S_IRUGO | S_IWUSR,
 -                                device_dir);
 +      acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST;
-       entry = proc_create_data("POST", S_IFREG | S_IRUGO | S_IRUSR,
++      entry = proc_create_data("POST", S_IFREG | S_IRUGO | S_IWUSR,
 +                               acpi_device_dir(device),
 +                               &acpi_video_bus_POST_fops,
 +                               acpi_driver_data(device));
        if (!entry)
-               return -ENODEV;
+               goto err_remove_post_info;
  
 -      acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST;
 -      entry->proc_fops = &acpi_video_bus_POST_fops;
 -      entry->data = acpi_driver_data(device);
 -      entry->owner = THIS_MODULE;
 -
        /* 'DOS' [R/W] */
 -      entry = create_proc_entry("DOS", S_IFREG | S_IRUGO | S_IWUSR,
 -                            device_dir);
 +      acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS;
-       entry = proc_create_data("DOS", S_IFREG | S_IRUGO | S_IRUSR,
++      entry = proc_create_data("DOS", S_IFREG | S_IRUGO | S_IWUSR,
 +                               acpi_device_dir(device),
 +                               &acpi_video_bus_DOS_fops,
 +                               acpi_driver_data(device));
        if (!entry)
-               return -ENODEV;
+               goto err_remove_post;
  
 -      acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS;
 -      entry->proc_fops = &acpi_video_bus_DOS_fops;
 -      entry->data = acpi_driver_data(device);
 -      entry->owner = THIS_MODULE;
 -
+       video->dir = acpi_device_dir(device) = device_dir;
        return 0;
+  err_remove_post:
+       remove_proc_entry("POST", device_dir);
+  err_remove_post_info:
+       remove_proc_entry("POST_info", device_dir);
+  err_remove_rom:
+       remove_proc_entry("ROM", device_dir);
+  err_remove_info:
+       remove_proc_entry("info", device_dir);
+  err_remove_dir:
+       remove_proc_entry(acpi_device_bid(device), acpi_video_dir);
+       return -ENOMEM;
  }
  
  static int acpi_video_bus_remove_fs(struct acpi_device *device)
Simple merge
Simple merge