Staging: comedi: addi-data: don't overwrite name for request_irq()

[pandora-kernel.git] / drivers / staging / rt2860 / rt_linux.c

diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index bfda187..0029b2d 100644 (file)
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -154,7 +154,7 @@ void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time)
 /* pAd MUST allow to be NULL */
 int os_alloc_mem(struct rt_rtmp_adapter *pAd, u8 ** mem, unsigned long size)
 {
-       *mem = (u8 *)kmalloc(size, GFP_ATOMIC);
+       *mem = kmalloc(size, GFP_ATOMIC);
        if (*mem)
                return NDIS_STATUS_SUCCESS;
        else
@@ -463,8 +463,8 @@ void *duplicate_pkt(struct rt_rtmp_adapter *pAd,
        struct sk_buff *skb;
        void *pPacket = NULL;
 
-       if ((skb =
-            __dev_alloc_skb(HdrLen + DataSize + 2, MEM_ALLOC_FLAG)) != NULL) {
+       skb = __dev_alloc_skb(HdrLen + DataSize + 2, MEM_ALLOC_FLAG);
+       if (skb != NULL) {
                skb_reserve(skb, 2);
                NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen);
                skb_put(skb, HdrLen);
@@ -673,7 +673,8 @@ void RTMPSendWirelessEvent(struct rt_rtmp_adapter *pAd,
                return;
        }
        /*Allocate memory and copy the msg. */
-       if ((pBuf = kmalloc(IW_CUSTOM_MAX_LEN, GFP_ATOMIC)) != NULL) {
+       pBuf = kmalloc(IW_CUSTOM_MAX_LEN, GFP_ATOMIC);
+       if (pBuf != NULL) {
                /*Prepare the payload */
                memset(pBuf, 0, IW_CUSTOM_MAX_LEN);