From: Jason Cooper Date: Thu, 30 Sep 2010 19:15:36 +0000 (-0400) Subject: staging: brcm80211: fix checkpatch error 'assignment in if condition' X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=57c096b897fe59e106452500afbbe0e0f1f8e149;p=openwrt%2Fstaging%2Fblogic.git staging: brcm80211: fix checkpatch error 'assignment in if condition' Signed-off-by: Jason Cooper Acked-by: Henry Ptasinski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/drivers/staging/brcm80211/brcmfmac/bcmutils.c index 34c37918ff5e..7c06c7a8294b 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--;