0001-make-debug-output-standard-compliant-in-rt2870.patch

[Giangiacomo Mariotti]

Signed-off-by: Giangiacomo Mariotti <giangiacomo.mariotti@xxxxxxxxx>
---
 drivers/staging/rt2860/chip/mac_usb.h        |    3 ++-
 drivers/staging/rt2860/common/cmm_data_usb.c |    6 +++---
 drivers/staging/rt2860/sta_ioctl.c           |   12 ++++++------
 drivers/staging/rt2860/usb_main_dev.c        |    2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rt2860/chip/mac_usb.h
b/drivers/staging/rt2860/chip/mac_usb.h
index ed0c0b4..e2310dc 100644
--- a/drivers/staging/rt2860/chip/mac_usb.h
+++ b/drivers/staging/rt2860/chip/mac_usb.h
@@ -37,6 +37,7 @@
 #ifndef __MAC_USB_H__
 #define __MAC_USB_H__

+#include <linux/kernel.h>
 #include "../rtmp_type.h"
 #include "rtmp_mac.h"
 #include "rtmp_phy.h"
@@ -224,7 +225,7 @@ struct rt_rx_context {
 				RTMP_IRQ_LOCK(&pAd->DeQueueLock[QueIdx], irqFlags);		\
 				if (pAd->DeQueueRunning[QueIdx]) {						\
 					RTMP_IRQ_UNLOCK(&pAd->DeQueueLock[QueIdx], irqFlags); \
-					DBGPRINT(RT_DEBUG_OFF, ("DeQueueRunning[%d]= TRUE!\n", QueIdx));		\
+					pr_debug("DeQueueRunning[%d]= TRUE!\n", QueIdx);		\
 					continue;											\
 				} else {												\
 					pAd->DeQueueRunning[QueIdx] = TRUE;					\
diff --git a/drivers/staging/rt2860/common/cmm_data_usb.c
b/drivers/staging/rt2860/common/cmm_data_usb.c
index 7c56c2f..be930ae 100644
--- a/drivers/staging/rt2860/common/cmm_data_usb.c
+++ b/drivers/staging/rt2860/common/cmm_data_usb.c
@@ -51,16 +51,16 @@ static inline int RtmpUSBCanDoWrite(struct
rt_rtmp_adapter *pAd,
 	     pHTTXContext->NextBulkOutPosition)
 	    && (pHTTXContext->CurWritePosition + LOCAL_TXBUF_SIZE) >
 	    pHTTXContext->NextBulkOutPosition) {
-		DBGPRINT(RT_DEBUG_ERROR, ("RtmpUSBCanDoWrite c1!\n"));
+		pr_debug("RtmpUSBCanDoWrite c1!\n");
 		RTUSB_SET_BULK_FLAG(pAd,
 				    (fRTUSB_BULK_OUT_DATA_NORMAL << QueIdx));
 	} else if ((pHTTXContext->CurWritePosition == 8)
 		   && (pHTTXContext->NextBulkOutPosition < LOCAL_TXBUF_SIZE)) {
-		DBGPRINT(RT_DEBUG_ERROR, ("RtmpUSBCanDoWrite c2!\n"));
+		pr_debug("RtmpUSBCanDoWrite c2!\n");
 		RTUSB_SET_BULK_FLAG(pAd,
 				    (fRTUSB_BULK_OUT_DATA_NORMAL << QueIdx));
 	} else if (pHTTXContext->bCurWriting == TRUE) {
-		DBGPRINT(RT_DEBUG_ERROR, ("RtmpUSBCanDoWrite c3!\n"));
+		pr_debug("RtmpUSBCanDoWrite c3!\n");
 	} else {
 		canWrite = NDIS_STATUS_SUCCESS;
 	}
diff --git a/drivers/staging/rt2860/sta_ioctl.c
b/drivers/staging/rt2860/sta_ioctl.c
index e095a44..00fe666 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -394,9 +394,9 @@ int rt_ioctl_siwfreq(struct net_device *dev,

 	if (ChannelSanity(pAdapter, chan) == TRUE) {
 		pAdapter->CommonCfg.Channel = chan;
-		DBGPRINT(RT_DEBUG_ERROR,
-			 ("==>rt_ioctl_siwfreq::SIOCSIWFREQ[cmd=0x%x] (Channel=%d)\n",
-			  SIOCSIWFREQ, pAdapter->CommonCfg.Channel));
+		netdev_dbg(dev,
+			"==>rt_ioctl_siwfreq::SIOCSIWFREQ[cmd=0x%x] (Channel=%d)\n",
+			SIOCSIWFREQ, pAdapter->CommonCfg.Channel);
 	} else
 		return -EINVAL;

@@ -1113,9 +1113,9 @@ int rt_ioctl_giwscan(struct net_device *dev,

 	data->length = current_ev - extra;
 	pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE;
-	DBGPRINT(RT_DEBUG_ERROR,
-		 ("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",
-		  i, pAdapter->ScanTab.BssNr, data->length));
+	netdev_dbg(dev,
+		"===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",
+		i, pAdapter->ScanTab.BssNr, data->length);
 	return 0;
 }

diff --git a/drivers/staging/rt2860/usb_main_dev.c
b/drivers/staging/rt2860/usb_main_dev.c
index cd15daa..5b0dfc0 100644
--- a/drivers/staging/rt2860/usb_main_dev.c
+++ b/drivers/staging/rt2860/usb_main_dev.c
@@ -715,7 +715,7 @@ void RTUSBWatchDog(struct rt_rtmp_adapter *pAd)
 				RTMP_IRQ_UNLOCK(&pAd->BulkOutLock[idx],
 						irqFlags);

-				printk(KERN_INFO "%d:%lu LTL=%d , TL=%d L:%d\n",
+				pr_debug("%d:%lu LTL=%d , TL=%d L:%d\n",
 				       idx, pAd->watchDogTxPendingCnt[idx],
 				       pAd->TransferedLength[idx],
 				       actual_length, transfer_buffer_length);
-- 
1.7.2.3

-- 
Giangiacomo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/