aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-14 10:00:53 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:50 -0400
commitb01676005446ad51a32bb00577647c7aae7d2624 (patch)
tree83617d9a02507116e19d08bdfcf848314f8cb4fd /include/media
parent3a63e4492fbc7aa7f99d4368822da1382ec6fe03 (diff)
V4L/DVB (10644): v4l2-subdev: rename dev field to v4l2_dev
Remain consistent in the naming: fields pointing to v4l2_device should be called v4l2_dev. There are too many device-like entities without adding to the confusion by mixing naming conventions. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-subdev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index cd640c6f039b..05b69652e6c4 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -137,7 +137,7 @@ struct v4l2_subdev_ops {
137struct v4l2_subdev { 137struct v4l2_subdev {
138 struct list_head list; 138 struct list_head list;
139 struct module *owner; 139 struct module *owner;
140 struct v4l2_device *dev; 140 struct v4l2_device *v4l2_dev;
141 const struct v4l2_subdev_ops *ops; 141 const struct v4l2_subdev_ops *ops;
142 /* name must be unique */ 142 /* name must be unique */
143 char name[V4L2_SUBDEV_NAME_SIZE]; 143 char name[V4L2_SUBDEV_NAME_SIZE];
@@ -176,7 +176,7 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
176 /* ops->core MUST be set */ 176 /* ops->core MUST be set */
177 BUG_ON(!ops || !ops->core); 177 BUG_ON(!ops || !ops->core);
178 sd->ops = ops; 178 sd->ops = ops;
179 sd->dev = NULL; 179 sd->v4l2_dev = NULL;
180 sd->name[0] = '\0'; 180 sd->name[0] = '\0';
181 sd->grp_id = 0; 181 sd->grp_id = 0;
182 sd->priv = NULL; 182 sd->priv = NULL;