git.openpandora.org / pandora-kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'linus' into sched/urgent
[pandora-kernel.git] / drivers / acpi / video.c
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index c24a1d7..d089c45 100644 (file)
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -190,6 +190,7 @@ struct acpi_video_device {
 /* bus */
 static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file);
 static struct file_operations acpi_video_bus_info_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_video_bus_info_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -198,6 +199,7 @@ static struct file_operations acpi_video_bus_info_fops = {
 
 static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file);
 static struct file_operations acpi_video_bus_ROM_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_video_bus_ROM_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -207,6 +209,7 @@ static struct file_operations acpi_video_bus_ROM_fops = {
 static int acpi_video_bus_POST_info_open_fs(struct inode *inode,
                                            struct file *file);
 static struct file_operations acpi_video_bus_POST_info_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_video_bus_POST_info_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -215,6 +218,7 @@ static struct file_operations acpi_video_bus_POST_info_fops = {
 
 static int acpi_video_bus_POST_open_fs(struct inode *inode, struct file *file);
 static struct file_operations acpi_video_bus_POST_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_video_bus_POST_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -223,6 +227,7 @@ static struct file_operations acpi_video_bus_POST_fops = {
 
 static int acpi_video_bus_DOS_open_fs(struct inode *inode, struct file *file);
 static struct file_operations acpi_video_bus_DOS_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_video_bus_DOS_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -233,6 +238,7 @@ static struct file_operations acpi_video_bus_DOS_fops = {
 static int acpi_video_device_info_open_fs(struct inode *inode,
                                          struct file *file);
 static struct file_operations acpi_video_device_info_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_video_device_info_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -242,6 +248,7 @@ static struct file_operations acpi_video_device_info_fops = {
 static int acpi_video_device_state_open_fs(struct inode *inode,
                                           struct file *file);
 static struct file_operations acpi_video_device_state_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_video_device_state_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -251,6 +258,7 @@ static struct file_operations acpi_video_device_state_fops = {
 static int acpi_video_device_brightness_open_fs(struct inode *inode,
                                                struct file *file);
 static struct file_operations acpi_video_device_brightness_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_video_device_brightness_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -260,6 +268,7 @@ static struct file_operations acpi_video_device_brightness_fops = {
 static int acpi_video_device_EDID_open_fs(struct inode *inode,
                                          struct file *file);
 static struct file_operations acpi_video_device_EDID_fops = {
+       .owner = THIS_MODULE,
        .open = acpi_video_device_EDID_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -732,21 +741,19 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                if (IS_ERR(device->cdev))
                        return;
 
-               if (device->cdev) {
-                       printk(KERN_INFO PREFIX
-                               "%s is registered as cooling_device%d\n",
-                               device->dev->dev.bus_id, device->cdev->id);
-                       result = sysfs_create_link(&device->dev->dev.kobj,
-                                         &device->cdev->device.kobj,
-                                         "thermal_cooling");
-                       if (result)
-                               printk(KERN_ERR PREFIX "Create sysfs link\n");
-                       result = sysfs_create_link(&device->cdev->device.kobj,
-                                         &device->dev->dev.kobj,
-                                         "device");
-                        if (result)
-                               printk(KERN_ERR PREFIX "Create sysfs link\n");
-               }
+               printk(KERN_INFO PREFIX
+                       "%s is registered as cooling_device%d\n",
+                       device->dev->dev.bus_id, device->cdev->id);
+               result = sysfs_create_link(&device->dev->dev.kobj,
+                               &device->cdev->device.kobj,
+                               "thermal_cooling");
+               if (result)
+                       printk(KERN_ERR PREFIX "Create sysfs link\n");
+               result = sysfs_create_link(&device->cdev->device.kobj,
+                               &device->dev->dev.kobj, "device");
+               if (result)
+                       printk(KERN_ERR PREFIX "Create sysfs link\n");
+
        }
        if (device->cap._DCS && device->cap._DSS){
                static int count = 0;
@@ -1063,47 +1070,39 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
        device_dir->owner = THIS_MODULE;
 
        /* 'info' [R] */
-       entry = create_proc_entry("info", S_IRUGO, device_dir);
+       entry = proc_create_data("info", S_IRUGO, device_dir,
+                       &acpi_video_device_info_fops, acpi_driver_data(device));
        if (!entry)
                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,
+                                device_dir,
+                                &acpi_video_device_state_fops,
+                                acpi_driver_data(device));
        if (!entry)
                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,
+                                device_dir,
+                                &acpi_video_device_brightness_fops,
+                                acpi_driver_data(device));
        if (!entry)
                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, device_dir,
+                                &acpi_video_device_EDID_fops,
+                                acpi_driver_data(device));
        if (!entry)
                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:
@@ -1349,54 +1348,44 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
        device_dir->owner = THIS_MODULE;
 
        /* 'info' [R] */
-       entry = create_proc_entry("info", S_IRUGO, device_dir);
+       entry = proc_create_data("info", S_IRUGO, device_dir,
+                                &acpi_video_bus_info_fops,
+                                acpi_driver_data(device));
        if (!entry)
                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, device_dir,
+                                &acpi_video_bus_ROM_fops,
+                                acpi_driver_data(device));
        if (!entry)
                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, device_dir,
+                                &acpi_video_bus_POST_info_fops,
+                                acpi_driver_data(device));
        if (!entry)
                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_IWUSR,
+                                device_dir,
+                                &acpi_video_bus_POST_fops,
+                                acpi_driver_data(device));
        if (!entry)
                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_IWUSR,
+                                device_dir,
+                                &acpi_video_bus_DOS_fops,
+                                acpi_driver_data(device));
        if (!entry)
                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;
 
@@ -1724,7 +1713,8 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
 
                status = acpi_video_bus_get_one_device(dev, video);
                if (ACPI_FAILURE(status)) {
-                       ACPI_EXCEPTION((AE_INFO, status, "Cant attach device"));
+                       ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+                                       "Cant attach device"));
                        continue;
                }
        }
Pandora Kernel Repository