Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / media / platform / ti / cal / cal.h

diff --git a/drivers/media/platform/ti/cal/cal.h b/drivers/media/platform/ti/cal/cal.h
index de73d6d21b6f1b32984e6907a7eb8d2d751e364b..0856297adc0bb2d5876b9fbfd75ba1cdf9009796 100644 (file)
--- a/drivers/media/platform/ti/cal/cal.h
+++ b/drivers/media/platform/ti/cal/cal.h
@@ -177,7 +177,6 @@ struct cal_camerarx {
 
        struct v4l2_subdev      subdev;
        struct media_pad        pads[CAL_CAMERARX_NUM_PADS];
-       struct v4l2_mbus_framefmt       formats[CAL_CAMERARX_NUM_PADS];
 
        /* protects the vc_* fields below */
        spinlock_t              vc_lock;
@@ -185,13 +184,6 @@ struct cal_camerarx {
        u16                     vc_frame_number[4];
        u32                     vc_sequence[4];
 
-       /*
-        * Lock for camerarx ops. Protects:
-        * - formats
-        * - enable_count
-        */
-       struct mutex            mutex;
-
        unsigned int            enable_count;
 };
 
@@ -327,8 +319,6 @@ const struct cal_format_info *cal_format_by_code(u32 code);
 
 void cal_quickdump_regs(struct cal_dev *cal);
 
-int cal_camerarx_get_remote_frame_desc(struct cal_camerarx *phy,
-                                      struct v4l2_mbus_frame_desc *desc);
 void cal_camerarx_disable(struct cal_camerarx *phy);
 void cal_camerarx_i913_errata(struct cal_camerarx *phy);
 struct cal_camerarx *cal_camerarx_create(struct cal_dev *cal,