OSDN Git Service

staging: rtl8712: use swap() in dequeue_xframe_ex()
authorFabian Frederick <fabf@skynet.be>
Wed, 10 Jun 2015 16:32:13 +0000 (18:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Jun 2015 00:19:47 +0000 (17:19 -0700)
Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/rtl8712_xmit.c

index 8c756df..86206d3 100644 (file)
@@ -188,7 +188,7 @@ static struct xmit_frame *dequeue_xframe_ex(struct xmit_priv *pxmitpriv,
        struct  __queue *pframe_queue = NULL;
        struct  xmit_frame *pxmitframe = NULL;
        int i, inx[4];
-       int j, tmp, acirp_cnt[4];
+       int j, acirp_cnt[4];
 
        /*entry indx: 0->vo, 1->vi, 2->be, 3->bk.*/
        inx[0] = 0; acirp_cnt[0] = pxmitpriv->voq_cnt;
@@ -198,12 +198,8 @@ static struct xmit_frame *dequeue_xframe_ex(struct xmit_priv *pxmitpriv,
        for (i = 0; i < 4; i++) {
                for (j = i + 1; j < 4; j++) {
                        if (acirp_cnt[j] < acirp_cnt[i]) {
-                               tmp = acirp_cnt[i];
-                               acirp_cnt[i] = acirp_cnt[j];
-                               acirp_cnt[j] = tmp;
-                               tmp = inx[i];
-                               inx[i] = inx[j];
-                               inx[j] = tmp;
+                               swap(acirp_cnt[i], acirp_cnt[j]);
+                               swap(inx[i], inx[j]);
                        }
                }
        }