Commit d8772818 authored by Yang Guang's avatar Yang Guang Committed by Mauro Carvalho Chehab

media: saa7134: use swap() to make code cleaner

Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid
opencoding it.
Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarDavid Yang <davidcomponentone@gmail.com>
Signed-off-by: default avatarYang Guang <yang.guang5@zte.com.cn>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent f0c2ba1e
...@@ -823,7 +823,7 @@ static int buffer_activate(struct saa7134_dev *dev, ...@@ -823,7 +823,7 @@ static int buffer_activate(struct saa7134_dev *dev,
{ {
struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_buf.vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_buf.vb2_queue->drv_priv;
unsigned long base,control,bpl; unsigned long base,control,bpl;
unsigned long bpl_uv,lines_uv,base2,base3,tmp; /* planar */ unsigned long bpl_uv, lines_uv, base2, base3; /* planar */
video_dbg("buffer_activate buf=%p\n", buf); video_dbg("buffer_activate buf=%p\n", buf);
buf->top_seen = 0; buf->top_seen = 0;
...@@ -868,11 +868,8 @@ static int buffer_activate(struct saa7134_dev *dev, ...@@ -868,11 +868,8 @@ static int buffer_activate(struct saa7134_dev *dev,
lines_uv = dev->height >> dev->fmt->vshift; lines_uv = dev->height >> dev->fmt->vshift;
base2 = base + bpl * dev->height; base2 = base + bpl * dev->height;
base3 = base2 + bpl_uv * lines_uv; base3 = base2 + bpl_uv * lines_uv;
if (dev->fmt->uvswap) { if (dev->fmt->uvswap)
tmp = base2; swap(base2, base3);
base2 = base3;
base3 = tmp;
}
video_dbg("uv: bpl=%ld lines=%ld base2/3=%ld/%ld\n", video_dbg("uv: bpl=%ld lines=%ld base2/3=%ld/%ld\n",
bpl_uv,lines_uv,base2,base3); bpl_uv,lines_uv,base2,base3);
if (V4L2_FIELD_HAS_BOTH(dev->field)) { if (V4L2_FIELD_HAS_BOTH(dev->field)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment