Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / media / video / stk-webcam.h

diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h
index 7e989d1..9f67366 100644 (file)
--- a/drivers/media/video/stk-webcam.h
+++ b/drivers/media/video/stk-webcam.h
@@ -79,6 +79,7 @@ enum stk_status {
 #define unset_present(dev)     ((dev)->status &= \
                                        ~(S_PRESENT|S_INITIALISED|S_STREAMING))
 #define set_initialised(dev)   ((dev)->status |= S_INITIALISED)
+#define unset_initialised(dev) ((dev)->status &= ~S_INITIALISED)
 #define set_memallocd(dev)     ((dev)->status |= S_MEMALLOCD)
 #define unset_memallocd(dev)   ((dev)->status &= ~S_MEMALLOCD)
 #define set_streaming(dev)     ((dev)->status |= S_STREAMING)
@@ -98,7 +99,6 @@ struct stk_camera {
 
        u8 isoc_ep;
 
-       struct kref kref;
        /* Not sure if this is right */
        atomic_t urbs_used;
 
@@ -120,15 +120,11 @@ struct stk_camera {
        unsigned sequence;
 };
 
-#define to_stk_camera(d) container_of(d, struct stk_camera, kref)
 #define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)
 
-void stk_camera_delete(struct kref *);
 int stk_camera_write_reg(struct stk_camera *, u16, u8);
 int stk_camera_read_reg(struct stk_camera *, u16, int *);
 
-int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val);
-int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val);
 int stk_sensor_init(struct stk_camera *);
 int stk_sensor_configure(struct stk_camera *);
 int stk_sensor_sleep(struct stk_camera *dev);