2 files changed, 11 insertions, 13 deletions

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index d54ca6c802db..c24d91897099 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -392,6 +392,12 @@ static ssize_t show_name(struct device *cd,
         return sprintf(buf, "%.*s\n", (int)sizeof(vfd->name), vfd->name);
 }
 
+static struct device_attribute video_device_attrs[] = {
+        __ATTR(name, S_IRUGO, show_name, NULL),
+        __ATTR(index, S_IRUGO, show_index, NULL),
+        __ATTR_NULL
+};
+
 struct video_device *video_device_alloc(void)
 {
         struct video_device *vfd;
@@ -420,12 +426,6 @@ static void video_release(struct device *cd)
         vfd->release(vfd);
 }
 
-static struct device_attribute video_device_attrs[] = {
-        __ATTR(name, S_IRUGO, show_name, NULL),
-        __ATTR(index, S_IRUGO, show_index, NULL),
-        __ATTR_NULL
-};
-
 static struct class video_class = {
         .name    = VIDEO_NAME,
         .dev_attrs = video_device_attrs,
@@ -2173,8 +2173,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 
         ret = get_index(vfd, index);
         if (ret < 0) {
-                printk(KERN_ERR "%s: get_index failed\n",
-                       __func__);
+                printk(KERN_ERR "%s: get_index failed\n", __func__);
                 goto fail_minor;
         }
 
@@ -2185,15 +2184,14 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 
         /* sysfs class */
         memset(&vfd->class_dev, 0x00, sizeof(vfd->class_dev));
-        if (vfd->dev)
-                vfd->class_dev.parent = vfd->dev;
         vfd->class_dev.class       = &video_class;
         vfd->class_dev.devt        = MKDEV(VIDEO_MAJOR, vfd->minor);
+        if (vfd->dev)
+                vfd->class_dev.parent = vfd->dev;
         sprintf(vfd->class_dev.bus_id, "%s%d", name_base, i - base);
         ret = device_register(&vfd->class_dev);
         if (ret < 0) {
-                printk(KERN_ERR "%s: device_register failed\n",
-                       __func__);
+                printk(KERN_ERR "%s: device_register failed\n", __func__);
                 goto fail_minor;
         }
 
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 3c934142f7f9..33f379b1ecfe 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -375,7 +375,7 @@ video_device_create_file(struct video_device *vfd,
 {
         int ret = device_create_file(&vfd->class_dev, attr);
         if (ret < 0)
-                printk(KERN_WARNING "%s error: %d\n", __FUNCTION__, ret);
+                printk(KERN_WARNING "%s error: %d\n", __func__, ret);
         return ret;
 }
 static inline void