diff options
| author | Holger Schurig | 2007-08-02 17:49:45 +0200 |
|---|---|---|
| committer | David S. Miller | 2007-10-11 01:49:50 +0200 |
| commit | c95c7f930ec6fee029c8e7957ab95b3967578070 (patch) | |
| tree | 7ab029048d7a62ca0a472fa6e0761d1f3012ba08 /drivers/net/wireless/libertas/if_usb.c | |
| parent | [PATCH] libertas: make more functions static & remove unused functions (diff) | |
| download | kernel-qcow2-linux-c95c7f930ec6fee029c8e7957ab95b3967578070.tar.gz kernel-qcow2-linux-c95c7f930ec6fee029c8e7957ab95b3967578070.tar.xz kernel-qcow2-linux-c95c7f930ec6fee029c8e7957ab95b3967578070.zip | |
[PATCH] libertas: uppercase some #defines
Usually constants defined by #define are in ALL_UPPERCASE. This patch
fixes this.
I also shuffled the bits around so that they match the bit positions in the
host-interrupt-state register of the CF/SDIO card :-)
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/if_usb.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index c28d9747b865..5efdeac6e208 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -601,11 +601,11 @@ static inline void process_cmdrequest(int recvlength, u8 *recvbuff, * data to clear the interrupt */ if (!priv->adapter->cur_cmd) { cmdbuf = priv->upld_buf; - priv->adapter->hisregcpy &= ~his_cmdupldrdy; + priv->adapter->hisregcpy &= ~MRVDRV_CMD_UPLD_RDY; } else cmdbuf = priv->adapter->cur_cmd->bufvirtualaddr; - cardp->usb_int_cause |= his_cmdupldrdy; + cardp->usb_int_cause |= MRVDRV_CMD_UPLD_RDY; priv->upld_len = (recvlength - MESSAGE_HEADER_LEN); memcpy(cmdbuf, recvbuff + MESSAGE_HEADER_LEN, priv->upld_len); @@ -682,7 +682,7 @@ static void if_usb_receive(struct urb *urb) break; } cardp->usb_event_cause <<= 3; - cardp->usb_int_cause |= his_cardevent; + cardp->usb_int_cause |= MRVDRV_CARDEVENT; kfree_skb(skb); libertas_interrupt(priv->dev); spin_unlock(&priv->adapter->driver_lock); |