Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions

[net-next-2.6.git] / include / media / v4l2-subdev.h

diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 4a97d7341a945754407704d1063df3d536cc71e1..b0316a7cf08d21f2ac68f1dc452894441948c155 100644 (file)
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -256,10 +256,6 @@ struct v4l2_subdev_video_ops {
        int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
        int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
        int (*s_stream)(struct v4l2_subdev *sd, int enable);
-       int (*enum_fmt)(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmtdesc);
-       int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
-       int (*try_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
-       int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
        int (*cropcap)(struct v4l2_subdev *sd, struct v4l2_cropcap *cc);
        int (*g_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
        int (*s_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
@@ -442,17 +438,28 @@ struct v4l2_subdev {
        /* can be used to group similar subdevs, value is driver-specific */
        u32 grp_id;
        /* pointer to private data */
-       void *priv;
+       void *dev_priv;
+       void *host_priv;
 };
 
 static inline void v4l2_set_subdevdata(struct v4l2_subdev *sd, void *p)
 {
-       sd->priv = p;
+       sd->dev_priv = p;
 }
 
 static inline void *v4l2_get_subdevdata(const struct v4l2_subdev *sd)
 {
-       return sd->priv;
+       return sd->dev_priv;
+}
+
+static inline void v4l2_set_subdev_hostdata(struct v4l2_subdev *sd, void *p)
+{
+       sd->host_priv = p;
+}
+
+static inline void *v4l2_get_subdev_hostdata(const struct v4l2_subdev *sd)
+{
+       return sd->host_priv;
 }
 
 static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
@@ -466,7 +473,8 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
        sd->flags = 0;
        sd->name[0] = '\0';
        sd->grp_id = 0;
-       sd->priv = NULL;
+       sd->dev_priv = NULL;
+       sd->host_priv = NULL;
 }
 
 /* Call an ops of a v4l2_subdev, doing the right checks against