MSI: Remove dev->first_msi_irq

[linux-2.6-omap-h63xx.git] / drivers / misc / sony-laptop.c

diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index bc863f5efd5df6a5393d230ee539222299dbf46f..c15c1f61bd1bfad853b8c6ea343d6cdd47e98135 100644 (file)
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -62,6 +62,7 @@
 #include <acpi/acpi_bus.h>
 #include <asm/uaccess.h>
 #include <linux/sonypi.h>
+#include <linux/sony-laptop.h>
 #ifdef CONFIG_SONY_LAPTOP_OLD
 #include <linux/poll.h>
 #include <linux/miscdevice.h>
@@ -1316,40 +1317,6 @@ static int __sony_pic_camera_on(void)
        return 0;
 }
 
-static ssize_t sony_pic_camerapower_store(struct device *dev,
-               struct device_attribute *attr,
-               const char *buffer, size_t count)
-{
-       unsigned long value;
-       int result;
-       if (count > 31)
-               return -EINVAL;
-
-       value = simple_strtoul(buffer, NULL, 10);
-
-       mutex_lock(&spic_dev.lock);
-       if (value)
-               result = __sony_pic_camera_on();
-       else
-               result = __sony_pic_camera_off();
-       mutex_unlock(&spic_dev.lock);
-
-       if (result)
-               return result;
-
-       return count;
-}
-
-static ssize_t sony_pic_camerapower_show(struct device *dev,
-               struct device_attribute *attr, char *buffer)
-{
-       ssize_t count;
-       mutex_lock(&spic_dev.lock);
-       count = snprintf(buffer, PAGE_SIZE, "%d\n", spic_dev.camera_power);
-       mutex_unlock(&spic_dev.lock);
-       return count;
-}
-
 /* External camera command (exported to the motion eye v4l driver) */
 int sony_pic_camera_command(int command, u8 value)
 {
@@ -1359,37 +1326,37 @@ int sony_pic_camera_command(int command, u8 value)
        mutex_lock(&spic_dev.lock);
 
        switch (command) {
-       case SONYPI_COMMAND_SETCAMERA:
+       case SONY_PIC_COMMAND_SETCAMERA:
                if (value)
                        __sony_pic_camera_on();
                else
                        __sony_pic_camera_off();
                break;
-       case SONYPI_COMMAND_SETCAMERABRIGHTNESS:
+       case SONY_PIC_COMMAND_SETCAMERABRIGHTNESS:
                wait_on_command(sony_pic_call3(0x90, SONYPI_CAMERA_BRIGHTNESS, value),
                                ITERATIONS_SHORT);
                break;
-       case SONYPI_COMMAND_SETCAMERACONTRAST:
+       case SONY_PIC_COMMAND_SETCAMERACONTRAST:
                wait_on_command(sony_pic_call3(0x90, SONYPI_CAMERA_CONTRAST, value),
                                ITERATIONS_SHORT);
                break;
-       case SONYPI_COMMAND_SETCAMERAHUE:
+       case SONY_PIC_COMMAND_SETCAMERAHUE:
                wait_on_command(sony_pic_call3(0x90, SONYPI_CAMERA_HUE, value),
                                ITERATIONS_SHORT);
                break;
-       case SONYPI_COMMAND_SETCAMERACOLOR:
+       case SONY_PIC_COMMAND_SETCAMERACOLOR:
                wait_on_command(sony_pic_call3(0x90, SONYPI_CAMERA_COLOR, value),
                                ITERATIONS_SHORT);
                break;
-       case SONYPI_COMMAND_SETCAMERASHARPNESS:
+       case SONY_PIC_COMMAND_SETCAMERASHARPNESS:
                wait_on_command(sony_pic_call3(0x90, SONYPI_CAMERA_SHARPNESS, value),
                                ITERATIONS_SHORT);
                break;
-       case SONYPI_COMMAND_SETCAMERAPICTURE:
+       case SONY_PIC_COMMAND_SETCAMERAPICTURE:
                wait_on_command(sony_pic_call3(0x90, SONYPI_CAMERA_PICTURE, value),
                                ITERATIONS_SHORT);
                break;
-       case SONYPI_COMMAND_SETCAMERAAGC:
+       case SONY_PIC_COMMAND_SETCAMERAAGC:
                wait_on_command(sony_pic_call3(0x90, SONYPI_CAMERA_AGC, value),
                                ITERATIONS_SHORT);
                break;
@@ -1521,13 +1488,11 @@ struct device_attribute spic_attr_##_name = __ATTR(_name,       \
                _mode, sony_pic_## _name ##_show,               \
                sony_pic_## _name ##_store)
 
-static SPIC_ATTR(camerapower, 0644);
 static SPIC_ATTR(bluetoothpower, 0644);
 static SPIC_ATTR(wwanpower, 0644);
 static SPIC_ATTR(fanspeed, 0644);
 
 static struct attribute *spic_attributes[] = {
-       &spic_attr_camerapower.attr,
        &spic_attr_bluetoothpower.attr,
        &spic_attr_wwanpower.attr,
        &spic_attr_fanspeed.attr,