summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-14 16:00:53 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2009-02-14 16:00:53 +0100
commit951bf44feee86f832f1b68efe05395dfee73a15c (patch)
treefabcea75829ff4b27ac894be38a0784fc1bfaab4 /linux/include/media
parent9511f472cfb47c53ad0f210dd137dedfb753cea7 (diff)
downloadmediapointer-dvb-s2-951bf44feee86f832f1b68efe05395dfee73a15c.tar.gz
mediapointer-dvb-s2-951bf44feee86f832f1b68efe05395dfee73a15c.tar.bz2
v4l2-subdev: rename dev field to v4l2_dev
From: Hans Verkuil <hverkuil@xs4all.nl> 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. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/v4l2-subdev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/include/media/v4l2-subdev.h b/linux/include/media/v4l2-subdev.h
index cd640c6f0..05b69652e 100644
--- a/linux/include/media/v4l2-subdev.h
+++ b/linux/include/media/v4l2-subdev.h
@@ -137,7 +137,7 @@ struct v4l2_subdev_ops {
struct v4l2_subdev {
struct list_head list;
struct module *owner;
- struct v4l2_device *dev;
+ struct v4l2_device *v4l2_dev;
const struct v4l2_subdev_ops *ops;
/* name must be unique */
char name[V4L2_SUBDEV_NAME_SIZE];
@@ -176,7 +176,7 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
/* ops->core MUST be set */
BUG_ON(!ops || !ops->core);
sd->ops = ops;
- sd->dev = NULL;
+ sd->v4l2_dev = NULL;
sd->name[0] = '\0';
sd->grp_id = 0;
sd->priv = NULL;