diff options
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-capture.c')
-rw-r--r-- | drivers/media/video/s5p-fimc/fimc-capture.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index 3b208f8325ae..2dc6e82c8084 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/video/s5p-fimc/fimc-capture.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "fimc-core.h" | 33 | #include "fimc-core.h" |
34 | 34 | ||
35 | static struct v4l2_subdev *fimc_subdev_register(struct fimc_dev *fimc, | 35 | static struct v4l2_subdev *fimc_subdev_register(struct fimc_dev *fimc, |
36 | struct s3c_fimc_isp_info *isp_info) | 36 | struct s5p_fimc_isp_info *isp_info) |
37 | { | 37 | { |
38 | struct i2c_adapter *i2c_adap; | 38 | struct i2c_adapter *i2c_adap; |
39 | struct fimc_vid_cap *vid_cap = &fimc->vid_cap; | 39 | struct fimc_vid_cap *vid_cap = &fimc->vid_cap; |
@@ -86,8 +86,8 @@ static void fimc_subdev_unregister(struct fimc_dev *fimc) | |||
86 | static int fimc_subdev_attach(struct fimc_dev *fimc, int index) | 86 | static int fimc_subdev_attach(struct fimc_dev *fimc, int index) |
87 | { | 87 | { |
88 | struct fimc_vid_cap *vid_cap = &fimc->vid_cap; | 88 | struct fimc_vid_cap *vid_cap = &fimc->vid_cap; |
89 | struct s3c_platform_fimc *pdata = fimc->pdata; | 89 | struct s5p_platform_fimc *pdata = fimc->pdata; |
90 | struct s3c_fimc_isp_info *isp_info; | 90 | struct s5p_fimc_isp_info *isp_info; |
91 | struct v4l2_subdev *sd; | 91 | struct v4l2_subdev *sd; |
92 | int i; | 92 | int i; |
93 | 93 | ||
@@ -115,7 +115,7 @@ static int fimc_subdev_attach(struct fimc_dev *fimc, int index) | |||
115 | 115 | ||
116 | static int fimc_isp_subdev_init(struct fimc_dev *fimc, int index) | 116 | static int fimc_isp_subdev_init(struct fimc_dev *fimc, int index) |
117 | { | 117 | { |
118 | struct s3c_fimc_isp_info *isp_info; | 118 | struct s5p_fimc_isp_info *isp_info; |
119 | int ret; | 119 | int ret; |
120 | 120 | ||
121 | ret = fimc_subdev_attach(fimc, index); | 121 | ret = fimc_subdev_attach(fimc, index); |
@@ -221,7 +221,7 @@ static int start_streaming(struct vb2_queue *q) | |||
221 | { | 221 | { |
222 | struct fimc_ctx *ctx = q->drv_priv; | 222 | struct fimc_ctx *ctx = q->drv_priv; |
223 | struct fimc_dev *fimc = ctx->fimc_dev; | 223 | struct fimc_dev *fimc = ctx->fimc_dev; |
224 | struct s3c_fimc_isp_info *isp_info; | 224 | struct s5p_fimc_isp_info *isp_info; |
225 | int ret; | 225 | int ret; |
226 | 226 | ||
227 | ret = v4l2_subdev_call(fimc->vid_cap.sd, video, s_stream, 1); | 227 | ret = v4l2_subdev_call(fimc->vid_cap.sd, video, s_stream, 1); |
@@ -570,8 +570,8 @@ static int fimc_cap_enum_input(struct file *file, void *priv, | |||
570 | struct v4l2_input *i) | 570 | struct v4l2_input *i) |
571 | { | 571 | { |
572 | struct fimc_ctx *ctx = priv; | 572 | struct fimc_ctx *ctx = priv; |
573 | struct s3c_platform_fimc *pldata = ctx->fimc_dev->pdata; | 573 | struct s5p_platform_fimc *pldata = ctx->fimc_dev->pdata; |
574 | struct s3c_fimc_isp_info *isp_info; | 574 | struct s5p_fimc_isp_info *isp_info; |
575 | 575 | ||
576 | if (i->index >= FIMC_MAX_CAMIF_CLIENTS) | 576 | if (i->index >= FIMC_MAX_CAMIF_CLIENTS) |
577 | return -EINVAL; | 577 | return -EINVAL; |
@@ -590,7 +590,7 @@ static int fimc_cap_s_input(struct file *file, void *priv, | |||
590 | { | 590 | { |
591 | struct fimc_ctx *ctx = priv; | 591 | struct fimc_ctx *ctx = priv; |
592 | struct fimc_dev *fimc = ctx->fimc_dev; | 592 | struct fimc_dev *fimc = ctx->fimc_dev; |
593 | struct s3c_platform_fimc *pdata = fimc->pdata; | 593 | struct s5p_platform_fimc *pdata = fimc->pdata; |
594 | 594 | ||
595 | if (fimc_capture_active(ctx->fimc_dev)) | 595 | if (fimc_capture_active(ctx->fimc_dev)) |
596 | return -EBUSY; | 596 | return -EBUSY; |