V4L/DVB (6293): V4L: convert struct class_device to struct device

[linux-2.6-omap-h63xx.git] / drivers / media / video / et61x251 / et61x251_core.c

diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 31062a981e36cbfb5f9fb47c275960f314569c7b..d5fef4c01c87a9ff0f100a34f9925670245a32eb 100644 (file)
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -706,7 +706,8 @@ static u8 et61x251_strtou8(const char* buff, size_t len, ssize_t* count)
    NOTE 2: buffers are PAGE_SIZE long
 */
 
-static ssize_t et61x251_show_reg(struct class_device* cd, char* buf)
+static ssize_t et61x251_show_reg(struct device* cd,
+                                struct device_attribute *attr, char* buf)
 {
        struct et61x251_device* cam;
        ssize_t count;
@@ -729,7 +730,8 @@ static ssize_t et61x251_show_reg(struct class_device* cd, char* buf)
 
 
 static ssize_t
-et61x251_store_reg(struct class_device* cd, const char* buf, size_t len)
+et61x251_store_reg(struct device* cd,
+                  struct device_attribute *attr, const char* buf, size_t len)
 {
        struct et61x251_device* cam;
        u8 index;
@@ -761,7 +763,8 @@ et61x251_store_reg(struct class_device* cd, const char* buf, size_t len)
 }
 
 
-static ssize_t et61x251_show_val(struct class_device* cd, char* buf)
+static ssize_t et61x251_show_val(struct device* cd,
+                                struct device_attribute *attr, char* buf)
 {
        struct et61x251_device* cam;
        ssize_t count;
@@ -792,7 +795,8 @@ static ssize_t et61x251_show_val(struct class_device* cd, char* buf)
 
 
 static ssize_t
-et61x251_store_val(struct class_device* cd, const char* buf, size_t len)
+et61x251_store_val(struct device* cd, struct device_attribute *attr,
+                  const char* buf, size_t len)
 {
        struct et61x251_device* cam;
        u8 value;
@@ -830,7 +834,8 @@ et61x251_store_val(struct class_device* cd, const char* buf, size_t len)
 }
 
 
-static ssize_t et61x251_show_i2c_reg(struct class_device* cd, char* buf)
+static ssize_t et61x251_show_i2c_reg(struct device* cd,
+                                    struct device_attribute *attr, char* buf)
 {
        struct et61x251_device* cam;
        ssize_t count;
@@ -855,7 +860,8 @@ static ssize_t et61x251_show_i2c_reg(struct class_device* cd, char* buf)
 
 
 static ssize_t
-et61x251_store_i2c_reg(struct class_device* cd, const char* buf, size_t len)
+et61x251_store_i2c_reg(struct device* cd, struct device_attribute *attr,
+                      const char* buf, size_t len)
 {
        struct et61x251_device* cam;
        u8 index;
@@ -887,7 +893,8 @@ et61x251_store_i2c_reg(struct class_device* cd, const char* buf, size_t len)
 }
 
 
-static ssize_t et61x251_show_i2c_val(struct class_device* cd, char* buf)
+static ssize_t et61x251_show_i2c_val(struct device* cd,
+                                    struct device_attribute *attr, char* buf)
 {
        struct et61x251_device* cam;
        ssize_t count;
@@ -923,7 +930,8 @@ static ssize_t et61x251_show_i2c_val(struct class_device* cd, char* buf)
 
 
 static ssize_t
-et61x251_store_i2c_val(struct class_device* cd, const char* buf, size_t len)
+et61x251_store_i2c_val(struct device* cd, struct device_attribute *attr,
+                      const char* buf, size_t len)
 {
        struct et61x251_device* cam;
        u8 value;
@@ -966,42 +974,40 @@ et61x251_store_i2c_val(struct class_device* cd, const char* buf, size_t len)
 }
 
 
-static CLASS_DEVICE_ATTR(reg, S_IRUGO | S_IWUSR,
-                        et61x251_show_reg, et61x251_store_reg);
-static CLASS_DEVICE_ATTR(val, S_IRUGO | S_IWUSR,
-                        et61x251_show_val, et61x251_store_val);
-static CLASS_DEVICE_ATTR(i2c_reg, S_IRUGO | S_IWUSR,
-                        et61x251_show_i2c_reg, et61x251_store_i2c_reg);
-static CLASS_DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
-                        et61x251_show_i2c_val, et61x251_store_i2c_val);
+static DEVICE_ATTR(reg, S_IRUGO | S_IWUSR,
+                  et61x251_show_reg, et61x251_store_reg);
+static DEVICE_ATTR(val, S_IRUGO | S_IWUSR,
+                  et61x251_show_val, et61x251_store_val);
+static DEVICE_ATTR(i2c_reg, S_IRUGO | S_IWUSR,
+                  et61x251_show_i2c_reg, et61x251_store_i2c_reg);
+static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
+                  et61x251_show_i2c_val, et61x251_store_i2c_val);
 
 
 static int et61x251_create_sysfs(struct et61x251_device* cam)
 {
-       struct class_device *classdev = &(cam->v4ldev->class_dev);
+       struct device *classdev = &(cam->v4ldev->class_dev);
        int err = 0;
 
-       if ((err = class_device_create_file(classdev, &class_device_attr_reg)))
+       if ((err = device_create_file(classdev, &dev_attr_reg)))
                goto err_out;
-       if ((err = class_device_create_file(classdev, &class_device_attr_val)))
+       if ((err = device_create_file(classdev, &dev_attr_val)))
                goto err_reg;
 
        if (cam->sensor.sysfs_ops) {
-               if ((err = class_device_create_file(classdev,
-                                                 &class_device_attr_i2c_reg)))
+               if ((err = device_create_file(classdev, &dev_attr_i2c_reg)))
                        goto err_val;
-               if ((err = class_device_create_file(classdev,
-                                                 &class_device_attr_i2c_val)))
+               if ((err = device_create_file(classdev, &dev_attr_i2c_val)))
                        goto err_i2c_reg;
        }
 
 err_i2c_reg:
        if (cam->sensor.sysfs_ops)
-               class_device_remove_file(classdev, &class_device_attr_i2c_reg);
+               device_remove_file(classdev, &dev_attr_i2c_reg);
 err_val:
-       class_device_remove_file(classdev, &class_device_attr_val);
+       device_remove_file(classdev, &dev_attr_val);
 err_reg:
-       class_device_remove_file(classdev, &class_device_attr_reg);
+       device_remove_file(classdev, &dev_attr_reg);
 err_out:
        return err;
 }