patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / acpi / thermal.c

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index a103ee7..00c8059 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -84,11 +84,11 @@ static int acpi_thermal_remove (struct acpi_device *device, int type);
 static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file);
-static ssize_t acpi_thermal_write_trip_points (struct file*,const char *,size_t,loff_t *);
+static ssize_t acpi_thermal_write_trip_points (struct file*,const char __user *,size_t,loff_t *);
 static int acpi_thermal_cooling_open_fs(struct inode *inode, struct file *file);
-static ssize_t acpi_thermal_write_cooling_mode (struct file*,const char *,size_t,loff_t *);
+static ssize_t acpi_thermal_write_cooling_mode (struct file*,const char __user *,size_t,loff_t *);
 static int acpi_thermal_polling_open_fs(struct inode *inode, struct file *file);
-static ssize_t acpi_thermal_write_polling(struct file*,const char *,size_t,loff_t *);
+static ssize_t acpi_thermal_write_polling(struct file*,const char __user *,size_t,loff_t *);
 
 static struct acpi_driver acpi_thermal_driver = {
        .name =         ACPI_THERMAL_DRIVER_NAME,
@@ -885,7 +885,7 @@ static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file)
 static ssize_t
 acpi_thermal_write_trip_points (
         struct file            *file,
-        const char             *buffer,
+        const char             __user *buffer,
         size_t                 count,
         loff_t                 *ppos)
 {
@@ -954,7 +954,7 @@ static int acpi_thermal_cooling_open_fs(struct inode *inode, struct file *file)
 static ssize_t
 acpi_thermal_write_cooling_mode (
        struct file             *file,
-       const char              *buffer,
+       const char              __user *buffer,
        size_t                  count,
        loff_t                  *ppos)
 {
@@ -1015,7 +1015,7 @@ static int acpi_thermal_polling_open_fs(struct inode *inode, struct file *file)
 static ssize_t
 acpi_thermal_write_polling (
        struct file             *file,
-       const char              *buffer,
+       const char              __user *buffer,
        size_t                  count,
        loff_t                  *ppos)
 {
@@ -1139,6 +1139,16 @@ acpi_thermal_remove_fs (
        ACPI_FUNCTION_TRACE("acpi_thermal_remove_fs");
 
        if (acpi_device_dir(device)) {
+               remove_proc_entry(ACPI_THERMAL_FILE_POLLING_FREQ,
+                                 acpi_device_dir(device));
+               remove_proc_entry(ACPI_THERMAL_FILE_COOLING_MODE,
+                                 acpi_device_dir(device));
+               remove_proc_entry(ACPI_THERMAL_FILE_TRIP_POINTS,
+                                 acpi_device_dir(device));
+               remove_proc_entry(ACPI_THERMAL_FILE_TEMPERATURE,
+                                 acpi_device_dir(device));
+               remove_proc_entry(ACPI_THERMAL_FILE_STATE,
+                                 acpi_device_dir(device));
                remove_proc_entry(acpi_device_bid(device), acpi_thermal_dir);
                acpi_device_dir(device) = NULL;
        }