media: atomisp: ov2680: s/ov2680_device/ov2680_dev/

[platform/kernel/linux-starfive.git] / drivers / staging / media / atomisp / i2c / ov2680.h

diff --git a/drivers/staging/media/atomisp/i2c/ov2680.h b/drivers/staging/media/atomisp/i2c/ov2680.h
index baf49eb..077ca6e 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov2680.h
+++ b/drivers/staging/media/atomisp/i2c/ov2680.h
@@ -30,8 +30,6 @@
 #include <linux/v4l2-mediabus.h>
 #include <media/media-entity.h>
 
-#include "../include/linux/atomisp_platform.h"
-
 #define OV2680_NATIVE_WIDTH                    1616
 #define OV2680_NATIVE_HEIGHT                   1216
 
@@ -108,12 +106,13 @@
 /*
  * ov2680 device structure.
  */
-struct ov2680_device {
+struct ov2680_dev {
        struct v4l2_subdev sd;
        struct media_pad pad;
        struct mutex input_lock;
        struct i2c_client *client;
        struct gpio_desc *powerdown;
+       struct fwnode_handle *ep_fwnode;
        bool is_streaming;
 
        struct ov2680_mode {
@@ -152,12 +151,12 @@ struct ov2680_reg {
        u32 val;        /* @set value for read/mod/write, @mask */
 };
 
-#define to_ov2680_sensor(x) container_of(x, struct ov2680_device, sd)
+#define to_ov2680_sensor(x) container_of(x, struct ov2680_dev, sd)
 
 static inline struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl)
 {
-       struct ov2680_device *sensor =
-               container_of(ctrl->handler, struct ov2680_device, ctrls.handler);
+       struct ov2680_dev *sensor =
+               container_of(ctrl->handler, struct ov2680_dev, ctrls.handler);
 
        return &sensor->sd;
 }