| Message ID | 20210106131702.32507-1-zhengyongjun3@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [-next] media: zoran: use resource_size | expand |
On Wed, Jan 06, 2021 at 09:17:02PM +0800, Zheng Yongjun wrote: > Use resource_size rather than a verbose computation on > the end and start fields. > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> > --- > drivers/staging/media/zoran/zoran_driver.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c > index 808196ea5b81..d60b4c73ea80 100644 > --- a/drivers/staging/media/zoran/zoran_driver.c > +++ b/drivers/staging/media/zoran/zoran_driver.c > @@ -1020,7 +1020,7 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq) > vq->buf_struct_size = sizeof(struct zr_buffer); > vq->ops = &zr_video_qops; > vq->mem_ops = &vb2_dma_contig_memops; > - vq->gfp_flags = GFP_DMA32, > + vq->gfp_flags = GFP_DMA32; The commit doesn't match the patch. Also this driver is in staging because it's going to be deleted soon so there probably isn't much point doing cleanups. If you're looking at the Smatch resource_size() message, then that's a tricky thing because of the + 1 on part of the "end - start + 1"... It's sometimes hard to know if we should add the + 1 which resource_size() does or not. (That check is ancient and not up to modern standards). regards, dan carpenter
Le Wed, Jan 06, 2021 at 05:51:00PM +0300, Dan Carpenter a écrit : > On Wed, Jan 06, 2021 at 09:17:02PM +0800, Zheng Yongjun wrote: > > Use resource_size rather than a verbose computation on > > the end and start fields. > > > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> > > --- > > drivers/staging/media/zoran/zoran_driver.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c > > index 808196ea5b81..d60b4c73ea80 100644 > > --- a/drivers/staging/media/zoran/zoran_driver.c > > +++ b/drivers/staging/media/zoran/zoran_driver.c > > @@ -1020,7 +1020,7 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq) > > vq->buf_struct_size = sizeof(struct zr_buffer); > > vq->ops = &zr_video_qops; > > vq->mem_ops = &vb2_dma_contig_memops; > > - vq->gfp_flags = GFP_DMA32, > > + vq->gfp_flags = GFP_DMA32; > > The commit doesn't match the patch. Also this driver is in > staging because it's going to be deleted soon so there probably isn't > much point doing cleanups. > No, the driver just came back in staging since I fixed the videobuf2 conversion. One of the reason it is kept in staging is that media maintainer want to test it with its own zoran card but covid19 delayed the physical recovery of it. So the patch need to be resent, please. Regards
On Wed, Jan 06, 2021 at 09:19:58PM +0100, LABBE Corentin wrote: > Le Wed, Jan 06, 2021 at 05:51:00PM +0300, Dan Carpenter a écrit : > > On Wed, Jan 06, 2021 at 09:17:02PM +0800, Zheng Yongjun wrote: > > > Use resource_size rather than a verbose computation on > > > the end and start fields. > > > > > > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> > > > --- > > > drivers/staging/media/zoran/zoran_driver.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c > > > index 808196ea5b81..d60b4c73ea80 100644 > > > --- a/drivers/staging/media/zoran/zoran_driver.c > > > +++ b/drivers/staging/media/zoran/zoran_driver.c > > > @@ -1020,7 +1020,7 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq) > > > vq->buf_struct_size = sizeof(struct zr_buffer); > > > vq->ops = &zr_video_qops; > > > vq->mem_ops = &vb2_dma_contig_memops; > > > - vq->gfp_flags = GFP_DMA32, > > > + vq->gfp_flags = GFP_DMA32; > > > > The commit doesn't match the patch. Also this driver is in > > staging because it's going to be deleted soon so there probably isn't > > much point doing cleanups. > > > > No, the driver just came back in staging since I fixed the videobuf2 conversion. Ah... Thanks. regards, dan carpenter
diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c index 808196ea5b81..d60b4c73ea80 100644 --- a/drivers/staging/media/zoran/zoran_driver.c +++ b/drivers/staging/media/zoran/zoran_driver.c @@ -1020,7 +1020,7 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq) vq->buf_struct_size = sizeof(struct zr_buffer); vq->ops = &zr_video_qops; vq->mem_ops = &vb2_dma_contig_memops; - vq->gfp_flags = GFP_DMA32, + vq->gfp_flags = GFP_DMA32; vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; vq->min_buffers_needed = 9; vq->lock = &zr->lock;
Use resource_size rather than a verbose computation on the end and start fields. Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> --- drivers/staging/media/zoran/zoran_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)