2021-12-18 01:58:16

by David Yang

Subject: [PATCH] media: saa7134: use swap() to make code cleaner

From: Yang Guang <[email protected]>

Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid
opencoding it.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: David Yang <[email protected]>
Signed-off-by: Yang Guang <[email protected]>
---
drivers/media/pci/saa7134/saa7134-video.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 374c8e1087de..6f4132058c35 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -823,7 +823,7 @@ static int buffer_activate(struct saa7134_dev *dev,
{
struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_buf.vb2_queue->drv_priv;
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);
buf->top_seen = 0;
@@ -869,9 +869,7 @@ static int buffer_activate(struct saa7134_dev *dev,
base2 = base + bpl * dev->height;
base3 = base2 + bpl_uv * lines_uv;
if (dev->fmt->uvswap) {
- tmp = base2;
- base2 = base3;
- base3 = tmp;
+ swap(base2, base3);
}
video_dbg("uv: bpl=%ld lines=%ld base2/3=%ld/%ld\n",
bpl_uv,lines_uv,base2,base3);
--
2.30.2

2021-12-18 09:16:50

by Mauro Carvalho Chehab

Subject: Re: [PATCH] media: saa7134: use swap() to make code cleaner

Em Sat, 18 Dec 2021 09:58:02 +0800
[email protected] escreveu:

> From: Yang Guang <[email protected]>
>
> Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid
> opencoding it.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: David Yang <[email protected]>
> Signed-off-by: Yang Guang <[email protected]>
> ---
> drivers/media/pci/saa7134/saa7134-video.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
> index 374c8e1087de..6f4132058c35 100644
> --- a/drivers/media/pci/saa7134/saa7134-video.c
> +++ b/drivers/media/pci/saa7134/saa7134-video.c
> @@ -823,7 +823,7 @@ static int buffer_activate(struct saa7134_dev *dev,
> {
> struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_buf.vb2_queue->drv_priv;
> 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);
> buf->top_seen = 0;
> @@ -869,9 +869,7 @@ static int buffer_activate(struct saa7134_dev *dev,
> base2 = base + bpl * dev->height;
> base3 = base2 + bpl_uv * lines_uv;
> if (dev->fmt->uvswap) {
> - tmp = base2;
> - base2 = base3;
> - base3 = tmp;
> + swap(base2, base3);
> }

No need for {}

> video_dbg("uv: bpl=%ld lines=%ld base2/3=%ld/%ld\n",
> bpl_uv,lines_uv,base2,base3);



Thanks,
Mauro