[media] media-device: better name Kernelspace/Userspace links
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 11 Dec 2015 09:25:01 +0000 (07:25 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 11 Jan 2016 14:19:03 +0000 (12:19 -0200)
The __media_device_enum_links() copies links definitions from
Kernelspace to userspace. It has to work with 3 structs that
handle with links. Better name them to:
link: Kernelspace internal link representation, of the
type media_link;
klink_desc:  struct media_link_desc pointer to the
kernel memory where the data will be filled;
ulink_desc:  struct media_link_desc pointer to the
memory where the data will be copied to
userspace.

Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/media-device.c

index 61883abaf0955b033920946fedd9383e7da9f2d6..14bd568e2f41dc59e8b5432e44ada436d4245300 100644 (file)
@@ -151,24 +151,25 @@ static long __media_device_enum_links(struct media_device *mdev,
        }
 
        if (links->links) {
-               struct media_link *ent_link;
-               struct media_link_desc __user *ulink = links->links;
+               struct media_link *link;
+               struct media_link_desc __user *ulink_desc = links->links;
 
-               list_for_each_entry(ent_link, &entity->links, list) {
-                       struct media_link_desc link;
+               list_for_each_entry(link, &entity->links, list) {
+                       struct media_link_desc klink_desc;
 
                        /* Ignore backlinks. */
-                       if (ent_link->source->entity != entity)
+                       if (link->source->entity != entity)
                                continue;
-                       memset(&link, 0, sizeof(link));
-                       media_device_kpad_to_upad(ent_link->source,
-                                                 &link.source);
-                       media_device_kpad_to_upad(ent_link->sink,
-                                                 &link.sink);
-                       link.flags = ent_link->flags;
-                       if (copy_to_user(ulink, &link, sizeof(*ulink)))
+                       memset(&klink_desc, 0, sizeof(klink_desc));
+                       media_device_kpad_to_upad(link->source,
+                                                 &klink_desc.source);
+                       media_device_kpad_to_upad(link->sink,
+                                                 &klink_desc.sink);
+                       klink_desc.flags = link->flags;
+                       if (copy_to_user(ulink_desc, &klink_desc,
+                                        sizeof(*ulink_desc)))
                                return -EFAULT;
-                       ulink++;
+                       ulink_desc++;
                }
        }