Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 271766
b: refs/heads/master
c: 035aa14
h: refs/heads/master
v: v3
  • Loading branch information
Marek Szyprowski authored and Mauro Carvalho Chehab committed Sep 6, 2011
1 parent dfec1db commit d7a662a
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 25a27d91006091e28532053c95fa36b70b79d3ad
refs/heads/master: 035aa1475d6e4afdf97dccf6c6d6059063398b57
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/atmel-isi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset)
Videobuf operations
------------------------------------------------------------------*/
static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[],
unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[])
{
struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/marvell-ccic/mcam-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ static int mcam_read_setup(struct mcam_camera *cam)
*/

static int mcam_vb_queue_setup(struct vb2_queue *vq, unsigned int *nbufs,
unsigned int *num_planes, unsigned long sizes[],
unsigned int *num_planes, unsigned int sizes[],
void *alloc_ctxs[])
{
struct mcam_camera *cam = vb2_get_drv_priv(vq);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/mem2mem_testdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
*/

static int m2mtest_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[],
unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[])
{
struct m2mtest_ctx *ctx = vb2_get_drv_priv(vq);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/mx3_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static void mx3_cam_dma_done(void *arg)
*/
static int mx3_videobuf_setup(struct vb2_queue *vq,
unsigned int *count, unsigned int *num_planes,
unsigned long sizes[], void *alloc_ctxs[])
unsigned int sizes[], void *alloc_ctxs[])
{
struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/pwc/pwc-if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
/* Videobuf2 operations */

static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[],
unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[])
{
struct pwc_device *pdev = vb2_get_drv_priv(vq);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/s5p-fimc/fimc-capture.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static unsigned int get_plane_size(struct fimc_frame *fr, unsigned int plane)
}

static int queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
unsigned int *num_planes, unsigned long sizes[],
unsigned int *num_planes, unsigned int sizes[],
void *allocators[])
{
struct fimc_ctx *ctx = vq->drv_priv;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/s5p-fimc/fimc-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ static void fimc_job_abort(void *priv)
}

static int fimc_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
unsigned int *num_planes, unsigned long sizes[],
unsigned int *num_planes, unsigned int sizes[],
void *allocators[])
{
struct fimc_ctx *ctx = vb2_get_drv_priv(vq);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ static const struct v4l2_ioctl_ops s5p_mfc_dec_ioctl_ops = {
};

static int s5p_mfc_queue_setup(struct vb2_queue *vq, unsigned int *buf_count,
unsigned int *plane_count, unsigned long psize[],
unsigned int *plane_count, unsigned int psize[],
void *allocators[])
{
struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1514,7 +1514,7 @@ static int check_vb_with_fmt(struct s5p_mfc_fmt *fmt, struct vb2_buffer *vb)

static int s5p_mfc_queue_setup(struct vb2_queue *vq,
unsigned int *buf_count, unsigned int *plane_count,
unsigned long psize[], void *allocators[])
unsigned int psize[], void *allocators[])
{
struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/s5p-tv/mixer_video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ static const struct v4l2_file_operations mxr_fops = {
};

static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[],
unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[])
{
struct mxr_layer *layer = vb2_get_drv_priv(vq);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/sh_mobile_ceu_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static int sh_mobile_ceu_soft_reset(struct sh_mobile_ceu_dev *pcdev)
*/
static int sh_mobile_ceu_videobuf_setup(struct vb2_queue *vq,
unsigned int *count, unsigned int *num_planes,
unsigned long sizes[], void *alloc_ctxs[])
unsigned int sizes[], void *alloc_ctxs[])
{
struct soc_camera_device *icd = container_of(vq, struct soc_camera_device, vb2_vidq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
Expand All @@ -243,7 +243,7 @@ static int sh_mobile_ceu_videobuf_setup(struct vb2_queue *vq,
*count = pcdev->video_limit / PAGE_ALIGN(sizes[0]);
}

dev_dbg(icd->parent, "count=%d, size=%lu\n", *count, sizes[0]);
dev_dbg(icd->parent, "count=%d, size=%u\n", *count, sizes[0]);

return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/vivi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ static void vivi_stop_generating(struct vivi_dev *dev)
Videobuf operations
------------------------------------------------------------------*/
static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[],
unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[])
{
struct vivi_dev *dev = vb2_get_drv_priv(vq);
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/media/videobuf2-core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ struct vb2_buffer {
*/
struct vb2_ops {
int (*queue_setup)(struct vb2_queue *q, unsigned int *num_buffers,
unsigned int *num_planes, unsigned long sizes[],
unsigned int *num_planes, unsigned int sizes[],
void *alloc_ctxs[]);

void (*wait_prepare)(struct vb2_queue *q);
Expand Down Expand Up @@ -273,7 +273,7 @@ struct vb2_queue {
wait_queue_head_t done_wq;

void *alloc_ctx[VIDEO_MAX_PLANES];
unsigned long plane_sizes[VIDEO_MAX_PLANES];
unsigned int plane_sizes[VIDEO_MAX_PLANES];

unsigned int streaming:1;

Expand Down

0 comments on commit d7a662a

Please sign in to comment.