2015-05-18 17:31:17

by Fabian Frédérick

[permalink] [raw]

Subject: [PATCH 1/1 linux-next] video: fbdev: matrox: use swap() in matroxfb_decode_var()

---

Use kernel.h macro definition.

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/video/fbdev/matrox/matroxfb_base.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index 62539ca..2ba4e54 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -591,12 +591,8 @@ static int matroxfb_decode_var(const struct matrox_fb_info *minfo,
unsigned int max_yres;

while (m1) {
- int t;
-
while (m2 >= m1) m2 -= m1;
- t = m1;
- m1 = m2;
- m2 = t;
+ swap(m1, m2);
}
m2 = linelen * PAGE_SIZE / m2;
*ydstorg = m2 = 0x400000 % m2;
--
2.4.0

2015-05-26 08:40:50

by Tomi Valkeinen

[permalink] [raw]

Subject: Re: [PATCH 1/1 linux-next] video: fbdev: matrox: use swap() in matroxfb_decode_var()

---

On 18/05/15 20:31, Fabian Frederick wrote:
> Use kernel.h macro definition.
>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> drivers/video/fbdev/matrox/matroxfb_base.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
> index 62539ca..2ba4e54 100644
> --- a/drivers/video/fbdev/matrox/matroxfb_base.c
> +++ b/drivers/video/fbdev/matrox/matroxfb_base.c
> @@ -591,12 +591,8 @@ static int matroxfb_decode_var(const struct matrox_fb_info *minfo,
> unsigned int max_yres;
>
> while (m1) {
> - int t;
> -
> while (m2 >= m1) m2 -= m1;
> - t = m1;
> - m1 = m2;
> - m2 = t;
> + swap(m1, m2);
> }
> m2 = linelen * PAGE_SIZE / m2;
> *ydstorg = m2 = 0x400000 % m2;
>

Thanks, I've queued this and the two other swap() patches for 4.2.

Tomi

---

Attachments:

signature.asc (819.00 B)
OpenPGP digital signature