aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2010-09-30 15:15:36 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 09:22:24 -0700
commit57c096b897fe59e106452500afbbe0e0f1f8e149 (patch)
treec09ba6136d35e91aab0372d14d5f5a1d2a98b886
parentc74c95cd1f6e4b59ecd75c0584b8b5589e7b60a3 (diff)
staging: brcm80211: fix checkpatch error 'assignment in if condition'
Signed-off-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/brcmfmac/bcmutils.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/drivers/staging/brcm80211/brcmfmac/bcmutils.c
index 34c37918ff5..7c06c7a8294 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmutils.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmutils.c
@@ -199,10 +199,12 @@ void *pktq_pdeq(struct pktq *pq, int prec)
q = &pq->q[prec];
- if ((p = q->head) == NULL)
+ p = q->head;
+ if (p == NULL)
return NULL;
- if ((q->head = PKTLINK(p)) == NULL)
+ q->head = PKTLINK(p);
+ if (q->head == NULL)
q->tail = NULL;
q->len--;
@@ -223,7 +225,8 @@ void *pktq_pdeq_tail(struct pktq *pq, int prec)
q = &pq->q[prec];
- if ((p = q->head) == NULL)
+ p = q->head;
+ if (p == NULL)
return NULL;
for (prev = NULL; p != q->tail; p = PKTLINK(p))
@@ -274,7 +277,8 @@ bool pktq_pdel(struct pktq *pq, void *pktbuf, int prec)
q = &pq->q[prec];
if (q->head == pktbuf) {
- if ((q->head = PKTLINK(pktbuf)) == NULL)
+ q->head = PKTLINK(pktbuf);
+ if (q->head == NULL)
q->tail = NULL;
} else {
for (p = q->head; p && PKTLINK(p) != pktbuf; p = PKTLINK(p))
@@ -325,10 +329,12 @@ void *pktq_deq(struct pktq *pq, int *prec_out)
q = &pq->q[prec];
- if ((p = q->head) == NULL)
+ p = q->head;
+ if (p == NULL)
return NULL;
- if ((q->head = PKTLINK(p)) == NULL)
+ q->head = PKTLINK(p);
+ if (q->head == NULL)
q->tail = NULL;
q->len--;
@@ -358,7 +364,8 @@ void *pktq_deq_tail(struct pktq *pq, int *prec_out)
q = &pq->q[prec];
- if ((p = q->head) == NULL)
+ p = q->head;
+ if (p == NULL)
return NULL;
for (prev = NULL; p != q->tail; p = PKTLINK(p))
@@ -456,10 +463,12 @@ void *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
q = &pq->q[prec];
- if ((p = q->head) == NULL)
+ p = q->head;
+ if (p == NULL)
return NULL;
- if ((q->head = PKTLINK(p)) == NULL)
+ q->head = PKTLINK(p);
+ if (q->head == NULL)
q->tail = NULL;
q->len--;