Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / rt2860 / rt_linux.c

diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index abfeea11721d7bb4c95ee8d23961ffc4e8e57bac..728864e18a18df8bfd87816387aa9061e3673c24 100644 (file)
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -321,7 +321,7 @@ int RTMPCloneNdisPacket(struct rt_rtmp_adapter *pAd,
 
        RTMP_SET_PACKET_SOURCE(OSPKT_TO_RTPKT(pkt), PKTSRC_NDIS);
 
-       printk("###Clone###\n");
+       printk(KERN_DEBUG "###Clone###\n");
 
        return NDIS_STATUS_SUCCESS;
 }
@@ -343,9 +343,8 @@ int RTMPAllocateNdisPacket(struct rt_rtmp_adapter *pAd,
                                           RTMP_PKT_TAIL_PADDING);
        if (pPacket == NULL) {
                *ppPacket = NULL;
-#ifdef DEBUG
-               printk("RTMPAllocateNdisPacket Fail\n");
-#endif
+               pr_devel("RTMPAllocateNdisPacket Fail\n");
+
                return NDIS_STATUS_FAILURE;
        }
        /* 2. clone the frame content */
@@ -601,15 +600,15 @@ void hex_dump(char *str, unsigned char *pSrcBufVA, unsigned int SrcBufLen)
                return;
 
        pt = pSrcBufVA;
-       printk("%s: %p, len = %d\n", str, pSrcBufVA, SrcBufLen);
+       printk(KERN_DEBUG "%s: %p, len = %d\n", str, pSrcBufVA, SrcBufLen);
        for (x = 0; x < SrcBufLen; x++) {
                if (x % 16 == 0)
-                       printk("0x%04x : ", x);
-               printk("%02x ", ((unsigned char)pt[x]));
+                       printk(KERN_DEBUG "0x%04x : ", x);
+               printk(KERN_DEBUG "%02x ", ((unsigned char)pt[x]));
                if (x % 16 == 15)
-                       printk("\n");
+                       printk(KERN_DEBUG "\n");
        }
-       printk("\n");
+       printk(KERN_DEBUG "\n");
 }
 
 /*
@@ -767,13 +766,13 @@ void send_monitor_packets(struct rt_rtmp_adapter *pAd, struct rt_rx_blk *pRxBlk)
                /* QOS */
                if (pRxBlk->pHeader->FC.SubType & 0x08) {
                        header_len += 2;
-                       /* Data skip QOS contorl field */
+                       /* Data skip QOS control field */
                        pRxBlk->DataSize -= 2;
                }
                /* Order bit: A-Ralink or HTC+ */
                if (pRxBlk->pHeader->FC.Order) {
                        header_len += 4;
-                       /* Data skip HTC contorl field */
+                       /* Data skip HTC control field */
                        pRxBlk->DataSize -= 4;
                }
                /* Copy Header */
@@ -854,7 +853,7 @@ void send_monitor_packets(struct rt_rtmp_adapter *pAd, struct rt_rx_blk *pRxBlk)
                                                                         RSSI1,
                                                                         RSSI_1),
                                    ConvertToRssi(pAd, pRxBlk->pRxWI->RSSI2,
-                                                 RSSI_2));;
+                                                 RSSI_2));
 
        ph->signal.did = DIDmsg_lnxind_wlansniffrm_signal;
        ph->signal.status = 0;
@@ -926,7 +925,7 @@ int RtmpOSIRQRequest(struct net_device *pNetDev)
                    request_irq(_pObj->pci_dev->irq, rt2860_interrupt, SA_SHIRQ,
                                (net_dev)->name, (net_dev));
                if (retval != 0)
-                       printk("RT2860: request_irq  ERROR(%d)\n", retval);
+                       printk(KERN_ERR "rt2860: request_irq  ERROR(%d)\n", retval);
        }
 
        return retval;
@@ -1022,7 +1021,7 @@ int RtmpOSTaskKill(struct rt_rtmp_os_task *pTask)
        }
 #else
        CHECK_PID_LEGALITY(pTask->taskPID) {
-               printk("Terminate the task(%s) with pid(%d)!\n",
+               printk(KERN_INFO "Terminate the task(%s) with pid(%d)!\n",
                       pTask->taskName, GET_PID_NUMBER(pTask->taskPID));
                mb();
                pTask->task_killed = 1;
@@ -1175,7 +1174,7 @@ int RtmpOSNetDevAddrSet(struct net_device *pNetDev, u8 *pMacAddr)
        net_dev = pNetDev;
        GET_PAD_FROM_NET_DEV(pAd, net_dev);
 
-       /* work-around for the SuSE due to it has it's own interface name management system. */
+       /* work-around for SuSE, due to them having their own interface name management system. */
        {
                NdisZeroMemory(pAd->StaCfg.dev_name, 16);
                NdisMoveMemory(pAd->StaCfg.dev_name, net_dev->name,
@@ -1300,7 +1299,7 @@ int RtmpOSNetDevAttach(struct net_device *pNetDev,
        int ret, rtnl_locked = FALSE;
 
        DBGPRINT(RT_DEBUG_TRACE, ("RtmpOSNetDevAttach()--->\n"));
-       /* If we need hook some callback function to the net device structrue, now do it. */
+       /* If we need hook some callback function to the net device structure, now do it. */
        if (pDevOpHook) {
                struct rt_rtmp_adapter *pAd = NULL;
 
@@ -1351,10 +1350,10 @@ struct net_device *RtmpOSNetDevCreate(struct rt_rtmp_adapter *pAd,
                return NULL;
        }
 
-       /* find a available interface name, max 32 interfaces */
+       /* find an available interface name, max 32 interfaces */
        status = RtmpOSNetDevRequestName(pAd, pNetDev, pNamePrefix, devNum);
        if (status != NDIS_STATUS_SUCCESS) {
-               /* error! no any available ra name can be used! */
+               /* error! no available ra name can be used! */
                DBGPRINT(RT_DEBUG_ERROR,
                         ("Assign interface name (%s with suffix 0~32) failed...\n",
                          pNamePrefix));