[PATCH 3/5] staging: bcm: Convert BCM_DEBUG_PRINT to bcm_dbg

[Joe Perches <joe@xxxxxxxxxxx>]

Shorten the uses for readability.

Remove DBG_TYPE_ from uses, add to macro.
Remove DBG_LVL_ from uses, add to macro.
Add missing newlines to formats.
Align arguments, wrap to 80 columns where appropriate.
Ignore long lines where appropriate.
Remove leading spaces from formats.
Replace leading line spaces with tabs where appropriate.

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
 drivers/staging/bcm/Bcmchar.c             |  242 +++++---
 drivers/staging/bcm/CmHost.c              |  964 +++++++++++++++++++----------
 drivers/staging/bcm/DDRInit.c             |  107 ++--
 drivers/staging/bcm/Debug.h               |   20 +-
 drivers/staging/bcm/HandleControlPacket.c |   33 +-
 drivers/staging/bcm/IPv6Protocol.c        |   96 ++-
 drivers/staging/bcm/InterfaceDld.c        |   98 ++-
 drivers/staging/bcm/InterfaceIdleMode.c   |   58 ++-
 drivers/staging/bcm/InterfaceInit.c       |   38 +-
 drivers/staging/bcm/InterfaceIsr.c        |   49 +-
 drivers/staging/bcm/InterfaceMisc.c       |   38 +-
 drivers/staging/bcm/InterfaceRx.c         |   35 +-
 drivers/staging/bcm/InterfaceTx.c         |   29 +-
 drivers/staging/bcm/LeakyBucket.c         |   82 ++-
 drivers/staging/bcm/Misc.c                |  499 ++++++++++-----
 drivers/staging/bcm/PHSModule.c           |  208 ++++---
 drivers/staging/bcm/Qos.c                 |  230 +++++---
 drivers/staging/bcm/Transmit.c            |   33 +-
 drivers/staging/bcm/hostmibs.c            |    3 +-
 drivers/staging/bcm/led_control.c         |   93 ++--
 drivers/staging/bcm/nvm.c                 |  332 +++++++---
 drivers/staging/bcm/sort.c                |    6 +-
 22 files changed, 2148 insertions(+), 1145 deletions(-)

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 89f66ee..922d177 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -109,14 +109,14 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size,
 						(pTarang->RxAppControlHead ||
 						 Adapter->device_removed));
 	if ((wait_ret_val == -ERESTARTSYS)) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-				"Exiting as i've been asked to exit!!!\n");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"Exiting as i've been asked to exit!!!\n");
 		return wait_ret_val;
 	}
 
 	if (Adapter->device_removed) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-				"Device Removed... Killing the Apps...\n");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"Device Removed... Killing the Apps...\n");
 		return -ENODEV;
 	}
 
@@ -143,13 +143,13 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size,
 			pr_info("Returning from copy to user failure\n");
 			return -EFAULT;
 		}
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-				"Read %zd Bytes From Adapter packet = %p by process %d!\n",
-				PktLen, Packet, current->pid);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"Read %zd Bytes From Adapter packet = %p by process %d!\n",
+			PktLen, Packet, current->pid);
 		dev_kfree_skb(Packet);
 	}
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<\n");
+	bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL, "<\n");
 	return PktLen;
 }
 
@@ -163,7 +163,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 	IOCTL_BUFFER IoBuffer;
 	int bytes;
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX", cmd, arg);
+	bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+		"Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX\n",
+		cmd, arg);
 
 	if (_IOC_TYPE(cmd) != BCM_IOCTL)
 		return -EFAULT;
@@ -277,9 +279,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 				(PUINT)sWrmBuffer.Data, sizeof(ULONG));
 
 		if (Status == STATUS_SUCCESS) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "WRM Done\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL, "WRM Done\n");
 		} else {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "WRM Failed\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL, "WRM Failed\n");
 			Status = -EFAULT;
 		}
 		break;
@@ -392,7 +394,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		if (Status == STATUS_SUCCESS) {
 			pr_info("WRM Done\n");
 		} else {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "WRM Failed\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL, "WRM Failed\n");
 			Status = -EFAULT;
 		}
 		break;
@@ -408,7 +410,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "GPIO Can't be set/clear in Low power Mode");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"GPIO Can't be set/clear in Low power Mode\n");
 			return -EACCES;
 		}
 
@@ -426,7 +429,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		value = (1<<uiBit);
 
 		if (IsReqGpioIsLedInNVM(Adapter, value) == FALSE) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Sorry, Requested GPIO<0x%X> is not correspond to LED !!!", value);
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Sorry, Requested GPIO<0x%X> is not correspond to LED !!!\n",
+				value);
 			Status = -EINVAL;
 			break;
 		}
@@ -437,9 +442,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG, (PUINT)(&value), sizeof(UINT));
 
 			if (Status == STATUS_SUCCESS) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Set the GPIO bit\n");
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"Set the GPIO bit\n");
 			} else {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Failed to set the %dth GPIO\n", uiBit);
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"Failed to set the %dth GPIO\n", uiBit);
 				break;
 			}
 		} else {
@@ -447,9 +454,12 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)(&value), sizeof(UINT));
 
 			if (Status == STATUS_SUCCESS) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Set the GPIO bit\n");
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"Set the GPIO bit\n");
 			} else {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Failed to clear the %dth GPIO\n", uiBit);
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"Failed to clear the %dth GPIO\n",
+					uiBit);
 				break;
 			}
 		}
@@ -457,8 +467,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
 		if (bytes < 0) {
 			Status = bytes;
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-					"GPIO_MODE_REGISTER read failed");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"GPIO_MODE_REGISTER read failed\n");
 			break;
 		} else {
 			Status = STATUS_SUCCESS;
@@ -470,9 +480,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 					(PUINT)ucResetValue, sizeof(UINT));
 
 		if (Status == STATUS_SUCCESS) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Set the GPIO to output Mode\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Set the GPIO to output Mode\n");
 		} else {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Failed to put GPIO in Output Mode\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Failed to put GPIO in Output Mode\n");
 			break;
 		}
 	}
@@ -480,13 +492,15 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 	case BCM_LED_THREAD_STATE_CHANGE_REQ: {
 		USER_THREAD_REQ threadReq = {0};
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "User made LED thread InActive");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"User made LED thread InActive\n");
 
 		if ((Adapter->IdleMode == TRUE) ||
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "GPIO Can't be set/clear in Low power Mode");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"GPIO Can't be set/clear in Low power Mode\n");
 			Status = -EACCES;
 			break;
 		}
@@ -503,10 +517,12 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		/* if LED thread is running(Actively or Inactively) set it state to make inactive */
 		if (Adapter->LEDInfo.led_thread_running) {
 			if (threadReq.ThreadState == LED_THREAD_ACTIVATION_REQ) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Activating thread req");
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"Activating thread req\n");
 				Adapter->DriverState = LED_THREAD_ACTIVE;
 			} else {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "DeActivating Thread req.....");
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"DeActivating Thread req.....\n");
 				Adapter->DriverState = LED_THREAD_INACTIVE;
 			}
 
@@ -573,9 +589,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -EFAULT;
 
 		if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == FALSE) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-					"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
-					pgpio_multi_info[WIMAX_IDX].uiGPIOMask, Adapter->gpioBitMap);
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!\n",
+				pgpio_multi_info[WIMAX_IDX].uiGPIOMask,
+				Adapter->gpioBitMap);
 			Status = -EINVAL;
 			break;
 		}
@@ -666,9 +683,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 		/* Validating the request */
 		if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) == FALSE) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-					"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
-					pgpio_multi_mode[WIMAX_IDX].uiGPIOMask, Adapter->gpioBitMap);
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!\n",
+				pgpio_multi_mode[WIMAX_IDX].uiGPIOMask,
+				Adapter->gpioBitMap);
 			Status = -EINVAL;
 			break;
 		}
@@ -689,8 +707,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 			Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(ULONG));
 			if (Status == STATUS_SUCCESS) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-						"WRM to GPIO_MODE_REGISTER Done");
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"WRM to GPIO_MODE_REGISTER Done\n");
 			} else {
 				pr_info("WRM to GPIO_MODE_REGISTER Failed\n");
 				Status = -EFAULT;
@@ -745,8 +763,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			goto cntrlEnd;
 
 		if (Adapter->bPreparingForLowPowerMode) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-					"Preparing Idle Mode is still True - Hence Rejecting control message\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Preparing Idle Mode is still True - Hence Rejecting control message\n");
 			Status = STATUS_FAILURE;
 			goto cntrlEnd;
 		}
@@ -760,8 +778,8 @@ cntrlEnd:
 
 	case IOCTL_BCM_BUFFER_DOWNLOAD_START: {
 		if (down_trylock(&Adapter->NVMRdmWrmLock)) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-					"IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
 			return -EACCES;
 		}
 
@@ -888,8 +906,8 @@ cntrlEnd:
 			up(&Adapter->NVMRdmWrmLock);
 			return Status;
 		} else {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-					DBG_LVL_ALL, "Firm Download Over...\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Firm Download Over...\n");
 		}
 
 		mdelay(10);
@@ -985,11 +1003,13 @@ cntrlEnd:
 
 		if (uiData) {
 			/* Allow All Packets */
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SWITCH_TRANSFER_MODE: ETH_PACKET_TUNNELING_MODE\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"IOCTL_BCM_SWITCH_TRANSFER_MODE: ETH_PACKET_TUNNELING_MODE\n");
 				Adapter->TransferMode = ETH_PACKET_TUNNELING_MODE;
 		} else {
 			/* Allow IP only Packets */
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SWITCH_TRANSFER_MODE: IP_PACKET_ONLY_MODE\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"IOCTL_BCM_SWITCH_TRANSFER_MODE: IP_PACKET_ONLY_MODE\n");
 			Adapter->TransferMode = IP_PACKET_ONLY_MODE;
 		}
 		Status = STATUS_SUCCESS;
@@ -1070,7 +1090,8 @@ cntrlEnd:
 		if (copy_from_user(&ulSFId, IoBuffer.InputBuffer, sizeof(ulSFId)))
 			return -EFAULT;
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Get DSX Data SF ID is =%lx\n", ulSFId);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"Get DSX Data SF ID is =%lx\n", ulSFId);
 		get_dsx_sf_data_to_application(Adapter, ulSFId, IoBuffer.OutputBuffer);
 		Status = STATUS_SUCCESS;
 	}
@@ -1236,7 +1257,7 @@ cntrlEnd:
 	{
 		USER_BCM_DBG_STATE sUserDebugState;
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "In SET_DEBUG ioctl\n");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL, "In SET_DEBUG ioctl\n");
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
 			return -EFAULT;
 
@@ -1329,7 +1350,8 @@ cntrlEnd:
 				(Adapter->bShutStatus == TRUE) ||
 				(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"Device is in Idle/Shutdown Mode\n");
 				up(&Adapter->NVMRdmWrmLock);
 				kfree(pReadData);
 				return -EACCES;
@@ -1354,7 +1376,8 @@ cntrlEnd:
 				(Adapter->bShutStatus == TRUE) ||
 				(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"Device is in Idle/Shutdown Mode\n");
 				up(&Adapter->NVMRdmWrmLock);
 				kfree(pReadData);
 				return -EACCES;
@@ -1379,7 +1402,8 @@ cntrlEnd:
 					if (((stNVMReadWrite.uiOffset + stNVMReadWrite.uiNumBytes) != Adapter->uiNVMDSDSize) ||
 						(stNVMReadWrite.uiNumBytes < SIGNATURE_SIZE)) {
 
-						BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "DSD Sig is present neither in Flash nor User provided Input..");
+						bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+							"DSD Sig is present neither in Flash nor User provided Input..\n");
 						up(&Adapter->NVMRdmWrmLock);
 						kfree(pReadData);
 						return Status;
@@ -1387,7 +1411,8 @@ cntrlEnd:
 
 					ulDSDMagicNumInUsrBuff = ntohl(*(PUINT)(pReadData + stNVMReadWrite.uiNumBytes - SIGNATURE_SIZE));
 					if (ulDSDMagicNumInUsrBuff != DSD_IMAGE_MAGIC_NUMBER) {
-						BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "DSD Sig is present neither in Flash nor User provided Input..");
+						bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+							"DSD Sig is present neither in Flash nor User provided Input..\n");
 						up(&Adapter->NVMRdmWrmLock);
 						kfree(pReadData);
 						return Status;
@@ -1410,7 +1435,10 @@ cntrlEnd:
 		}
 
 		do_gettimeofday(&tv1);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " timetaken by Write/read :%ld msec\n", (tv1.tv_sec - tv0.tv_sec)*1000 + (tv1.tv_usec - tv0.tv_usec)/1000);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"timetaken by Write/read :%ld msec\n",
+			(tv1.tv_sec - tv0.tv_sec)*1000 +
+			(tv1.tv_usec - tv0.tv_usec)/1000);
 
 		kfree(pReadData);
 		return STATUS_SUCCESS;
@@ -1430,7 +1458,8 @@ cntrlEnd:
 			return -EINVAL;
 		}
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_READ Called");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_BCM_FLASH2X_SECTION_READ Called\n");
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
 			return -EFAULT;
 
@@ -1438,10 +1467,15 @@ cntrlEnd:
 		if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE)))
 			return -EFAULT;
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xRead.Section);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.offset :%x", sFlash2xRead.offset);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.numOfBytes :%x", sFlash2xRead.numOfBytes);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.bVerify :%x\n", sFlash2xRead.bVerify);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"sFlash2xRead.Section :%x\n", sFlash2xRead.Section);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"sFlash2xRead.offset :%x\n", sFlash2xRead.offset);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"sFlash2xRead.numOfBytes :%x\n",
+			sFlash2xRead.numOfBytes);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"sFlash2xRead.bVerify :%x\n", sFlash2xRead.bVerify);
 
 		/* This was internal to driver for raw read. now it has ben exposed to user space app. */
 		if (validateFlash2xReadWrite(Adapter, &sFlash2xRead) == FALSE)
@@ -1467,7 +1501,8 @@ cntrlEnd:
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Device is in Idle/Shutdown Mode\n");
 			up(&Adapter->NVMRdmWrmLock);
 			kfree(pReadBuff);
 			return -EACCES;
@@ -1482,7 +1517,9 @@ cntrlEnd:
 			/* Reading the data from Flash 2.x */
 			Status = BcmFlash2xBulkRead(Adapter, (PUINT)pReadBuff, sFlash2xRead.Section, ReadOffset, ReadBytes);
 			if (Status) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Flash 2x read err with Status :%d", Status);
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"Flash 2x read err with Status :%d\n",
+					Status);
 				break;
 			}
 
@@ -1490,7 +1527,9 @@ cntrlEnd:
 
 			Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
 			if (Status) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy to use failed with status :%d", Status);
+				bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+					"Copy to use failed with status :%d\n",
+					Status);
 				up(&Adapter->NVMRdmWrmLock);
 				kfree(pReadBuff);
 				return -EFAULT;
@@ -1524,7 +1563,8 @@ cntrlEnd:
 		/* First make this False so that we can enable the Sector Permission Check in BeceemFlashBulkWrite */
 		Adapter->bAllDSDWriteAllow = FALSE;
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_WRITE Called");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_BCM_FLASH2X_SECTION_WRITE Called\n");
 
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
 			return -EFAULT;
@@ -1533,13 +1573,19 @@ cntrlEnd:
 		if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE)))
 			return -EFAULT;
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xWrite.Section);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.offset :%d", sFlash2xWrite.offset);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.numOfBytes :%x", sFlash2xWrite.numOfBytes);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.bVerify :%x\n", sFlash2xWrite.bVerify);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"sFlash2xRead.Section :%x\n", sFlash2xWrite.Section);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"sFlash2xRead.offset :%d\n", sFlash2xWrite.offset);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"sFlash2xRead.numOfBytes :%x\n",
+			sFlash2xWrite.numOfBytes);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"sFlash2xRead.bVerify :%x\n", sFlash2xWrite.bVerify);
 
 		if ((sFlash2xWrite.Section != VSA0) && (sFlash2xWrite.Section != VSA1) && (sFlash2xWrite.Section != VSA2)) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Only VSA write is allowed");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Only VSA write is allowed\n");
 			return -EINVAL;
 		}
 
@@ -1574,7 +1620,8 @@ cntrlEnd:
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Device is in Idle/Shutdown Mode\n");
 			up(&Adapter->NVMRdmWrmLock);
 			kfree(pWriteBuff);
 			return -EACCES;
@@ -1620,7 +1667,8 @@ cntrlEnd:
 
 	case IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP: {
 		PFLASH2X_BITMAP psFlash2xBitMap;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP Called");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP Called\n");
 
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
 			return -EFAULT;
@@ -1641,7 +1689,8 @@ cntrlEnd:
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Device is in Idle/Shutdown Mode\n");
 			up(&Adapter->NVMRdmWrmLock);
 			kfree(psFlash2xBitMap);
 			return -EACCES;
@@ -1660,7 +1709,8 @@ cntrlEnd:
 
 	case IOCTL_BCM_SET_ACTIVE_SECTION: {
 		FLASH2X_SECTION_VAL eFlash2xSectionVal = 0;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SET_ACTIVE_SECTION Called");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_BCM_SET_ACTIVE_SECTION Called\n");
 
 		if (IsFlash2x(Adapter) != TRUE) {
 			pr_info("Flash Does not have 2.x map\n");
@@ -1685,7 +1735,8 @@ cntrlEnd:
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Device is in Idle/Shutdown Mode\n");
 			up(&Adapter->NVMRdmWrmLock);
 			return -EACCES;
 		}
@@ -1702,7 +1753,8 @@ cntrlEnd:
 	case IOCTL_BCM_IDENTIFY_ACTIVE_SECTION: {
 		/* Right Now we are taking care of only DSD */
 		Adapter->bAllDSDWriteAllow = FALSE;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called\n");
 		Status = STATUS_SUCCESS;
 	}
 	break;
@@ -1710,7 +1762,8 @@ cntrlEnd:
 	case IOCTL_BCM_COPY_SECTION: {
 		FLASH2X_COPY_SECTION sCopySectStrut = {0};
 		Status = STATUS_SUCCESS;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_COPY_SECTION  Called");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_BCM_COPY_SECTION  Called\n");
 
 		Adapter->bAllDSDWriteAllow = FALSE;
 		if (IsFlash2x(Adapter) != TRUE) {
@@ -1732,10 +1785,14 @@ cntrlEnd:
 			return -EFAULT;
 		}
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Source SEction :%x", sCopySectStrut.SrcSection);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Destination SEction :%x", sCopySectStrut.DstSection);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "offset :%x", sCopySectStrut.offset);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "NOB :%x", sCopySectStrut.numOfBytes);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"Source SEction :%x\n", sCopySectStrut.SrcSection);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"Destination SEction :%x\n", sCopySectStrut.DstSection);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"offset :%x\n", sCopySectStrut.offset);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"NOB :%x\n", sCopySectStrut.numOfBytes);
 
 		if (IsSectionExistInFlash(Adapter, sCopySectStrut.SrcSection) == FALSE) {
 			pr_info("Source Section<%x> does not exist in Flash\n",
@@ -1750,7 +1807,8 @@ cntrlEnd:
 		}
 
 		if (sCopySectStrut.SrcSection == sCopySectStrut.DstSection) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Source and Destination section should be different");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Source and Destination section should be different\n");
 			return -EINVAL;
 		}
 
@@ -1760,7 +1818,8 @@ cntrlEnd:
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Device is in Idle/Shutdown Mode\n");
 			up(&Adapter->NVMRdmWrmLock);
 			return -EACCES;
 		}
@@ -1787,7 +1846,8 @@ cntrlEnd:
 
 	case IOCTL_BCM_GET_FLASH_CS_INFO: {
 		Status = STATUS_SUCCESS;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " IOCTL_BCM_GET_FLASH_CS_INFO Called");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_BCM_GET_FLASH_CS_INFO Called\n");
 
 		Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
 		if (Status) {
@@ -1821,7 +1881,8 @@ cntrlEnd:
 		UINT SectOfset = 0;
 		FLASH2X_SECTION_VAL eFlash2xSectionVal;
 		eFlash2xSectionVal = NO_SECTION_VAL;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SELECT_DSD Called");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_BCM_SELECT_DSD Called\n");
 
 		if (IsFlash2x(Adapter) != TRUE) {
 			pr_info("Flash Does not have 2.x map\n");
@@ -1839,7 +1900,8 @@ cntrlEnd:
 			return -EFAULT;
 		}
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Read Section :%d", eFlash2xSectionVal);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"Read Section :%d\n", eFlash2xSectionVal);
 		if ((eFlash2xSectionVal != DSD0) &&
 			(eFlash2xSectionVal != DSD1) &&
 			(eFlash2xSectionVal != DSD2)) {
@@ -1909,7 +1971,8 @@ cntrlEnd:
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"Device is in Idle/Shutdown Mode\n");
 			kfree(pReadBuff);
 			up(&Adapter->NVMRdmWrmLock);
 			return -EACCES;
@@ -1959,7 +2022,8 @@ cntrlEnd:
 		/* Copy Ioctl Buffer structure */
 		Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
 		if (Status) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of Ioctl buffer is failed from user space");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"copy of Ioctl buffer is failed from user space\n");
 			return -EFAULT;
 		}
 
@@ -1970,10 +2034,13 @@ cntrlEnd:
 
 		Status = copy_from_user(&RxCntrlMsgBitMask, IoBuffer.InputBuffer, IoBuffer.InputLength);
 		if (Status) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of control bit mask failed from user space");
+			bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+				"copy of control bit mask failed from user space\n");
 			return -EFAULT;
 		}
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\n Got user defined cntrl msg bit mask :%lx", RxCntrlMsgBitMask);
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"Got user defined cntrl msg bit mask :%lx\n",
+			RxCntrlMsgBitMask);
 		pTarang->RxCntrlMsgBitMask = RxCntrlMsgBitMask;
 	}
 	break;
@@ -1981,7 +2048,8 @@ cntrlEnd:
 	case IOCTL_BCM_GET_DEVICE_DRIVER_INFO: {
 		DEVICE_DRIVER_INFO DevInfo;
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
 
 		DevInfo.MaxRDMBufferSize = BUFFER_4K;
 		DevInfo.u32DSDStartOffset = EEPROM_CALPARAM_START;
@@ -2003,7 +2071,8 @@ cntrlEnd:
 	case IOCTL_BCM_TIME_SINCE_NET_ENTRY: {
 		ST_TIME_ELAPSED stTimeElapsedSinceNetEntry = {0};
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_TIME_SINCE_NET_ENTRY called");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_BCM_TIME_SINCE_NET_ENTRY called\n");
 
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
 			return -EFAULT;
@@ -2019,7 +2088,8 @@ cntrlEnd:
 	break;
 
 	case IOCTL_CLOSE_NOTIFICATION:
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_CLOSE_NOTIFICATION");
+		bcm_dbg(Adapter, OTHERS, OSAL_DBG, ALL,
+			"IOCTL_CLOSE_NOTIFICATION\n");
 		break;
 
 	default:
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 0fed26c..bacbd59 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -127,8 +127,8 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 		nSizeOfIPAddressInBytes = IPV6_ADDRESS_SIZEINBYTES;
 	}
 	//Destination Ip Address
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Ip Address Range Length:0x%X ",
-				u8IpAddressLen);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Ip Address Range Length:0x%X\n", u8IpAddressLen);
 	if((bIpVersion6?(IPV6_ADDRESS_SIZEINBYTES * MAX_IP_RANGE_LENGTH * 2):
 			(TOTAL_MASKED_ADDRESS_IN_BYTES)) >= u8IpAddressLen)
 	{
@@ -175,8 +175,8 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 					pstClassifierEntry->stSrcIpAddress.ucIpv4Mask;
 			}
 		}
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Address Length:0x%X \n",
-				pstClassifierEntry->ucIPDestinationAddressLength);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Address Length:0x%X\n",
+			pstClassifierEntry->ucIPDestinationAddressLength);
 		while((u8IpAddressLen>= nSizeOfIPAddressInBytes) &&
 				(ucLoopIndex < MAX_IP_RANGE_LENGTH))
 		{
@@ -191,13 +191,17 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 					pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[ucLoopIndex]=
 						ntohl(pstClassifierEntry->stSrcIpAddress.
 								ulIpv4Addr[ucLoopIndex]);
-					BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Src Ip Address:0x%luX ",pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[ucLoopIndex]);
+					bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+						"Src Ip Address:0x%luX\n",
+						pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[ucLoopIndex]);
 				}
 				else if(eIpAddrContext == eDestIpAddress)
 				{
 					pstClassifierEntry->stDestIpAddress.ulIpv4Addr[ucLoopIndex]=						ntohl(pstClassifierEntry->stDestIpAddress.
 								ulIpv4Addr[ucLoopIndex]);
-					BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Dest Ip Address:0x%luX ",pstClassifierEntry->stDestIpAddress.ulIpv4Addr[ucLoopIndex]);
+					bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+						"Dest Ip Address:0x%luX\n",
+						pstClassifierEntry->stDestIpAddress.ulIpv4Addr[ucLoopIndex]);
 				}
 			}
 			u8IpAddressLen-=nSizeOfIPAddressInBytes;
@@ -216,7 +220,9 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 											ulIpv4Mask[ucLoopIndex]=
 								ntohl(pstClassifierEntry->stSrcIpAddress.
 											ulIpv4Mask[ucLoopIndex]);
-						BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Src Ip Mask Address:0x%luX ",pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[ucLoopIndex]);
+						bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+							"Src Ip Mask Address:0x%luX\n",
+							pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[ucLoopIndex]);
 					}
 					else if(eIpAddrContext == eDestIpAddress)
 					{
@@ -224,7 +230,9 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 										ulIpv4Mask[ucLoopIndex] =
 									ntohl(pstClassifierEntry->stDestIpAddress.
 											ulIpv4Mask[ucLoopIndex]);
-						BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Dest Ip Mask Address:0x%luX ",pstClassifierEntry->stDestIpAddress.ulIpv4Mask[ucLoopIndex]);
+						bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+							"Dest Ip Mask Address:0x%luX\n",
+							pstClassifierEntry->stDestIpAddress.ulIpv4Mask[ucLoopIndex]);
 					}
 				}
 				u8IpAddressLen-=nSizeOfIPAddressInBytes;
@@ -297,7 +305,9 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 		return;
 
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Storing Classifier Rule Index : %X",ntohs(psfCSType->cCPacketClassificationRule.u16PacketClassificationRuleIndex));
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Storing Classifier Rule Index : %X\n",
+		ntohs(psfCSType->cCPacketClassificationRule.u16PacketClassificationRuleIndex));
 
 	if(nClassifierIndex > MAX_CLASSIFIERS-1)
 		return;
@@ -311,7 +321,9 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 
 		//Destinaiton Port
 		pstClassifierEntry->ucDestPortRangeLength=psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength/4;
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Destination Port Range Length:0x%X ",pstClassifierEntry->ucDestPortRangeLength);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Destination Port Range Length:0x%X\n",
+			pstClassifierEntry->ucDestPortRangeLength);
 		if(	MAX_PORT_RANGE >= psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength)
 		{
 			for(ucLoopIndex=0;ucLoopIndex<(pstClassifierEntry->ucDestPortRangeLength);ucLoopIndex++)
@@ -321,7 +333,9 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 				pstClassifierEntry->usDestPortRangeHi[ucLoopIndex] =
 					*((PUSHORT)(psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange+2+ucLoopIndex));
 				pstClassifierEntry->usDestPortRangeLo[ucLoopIndex]=ntohs(pstClassifierEntry->usDestPortRangeLo[ucLoopIndex]);
-				BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Destination Port Range Lo:0x%X ",pstClassifierEntry->usDestPortRangeLo[ucLoopIndex]);
+				bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+					"Destination Port Range Lo:0x%X\n",
+					pstClassifierEntry->usDestPortRangeLo[ucLoopIndex]);
 				pstClassifierEntry->usDestPortRangeHi[ucLoopIndex]=ntohs(pstClassifierEntry->usDestPortRangeHi[ucLoopIndex]);
 			}
 		}
@@ -330,7 +344,9 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 			pstClassifierEntry->ucDestPortRangeLength=0;
 		}
 		//Source Port
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Source Port Range Length:0x%X ",psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Source Port Range Length:0x%X\n",
+			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength);
 		if(MAX_PORT_RANGE >=
 		psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength)
 		{
@@ -348,12 +364,15 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 							u8ProtocolSourcePortRange+2+ucLoopIndex));
 				pstClassifierEntry->usSrcPortRangeLo[ucLoopIndex] =
 					ntohs(pstClassifierEntry->usSrcPortRangeLo[ucLoopIndex]);
-				BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Source Port Range Lo:0x%X ",pstClassifierEntry->usSrcPortRangeLo[ucLoopIndex]);
+				bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+					"Source Port Range Lo:0x%X\n",
+					pstClassifierEntry->usSrcPortRangeLo[ucLoopIndex]);
 				pstClassifierEntry->usSrcPortRangeHi[ucLoopIndex]=ntohs(pstClassifierEntry->usSrcPortRangeHi[ucLoopIndex]);
 			}
 		}
 		//Destination Ip Address and Mask
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Ip Destination Parameters : ");
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Ip Destination Parameters :\n");
 
 		CopyIpAddrToClassifier(pstClassifierEntry,
 		   psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength,
@@ -362,7 +381,8 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 			TRUE:FALSE, eDestIpAddress);
 
 		//Source Ip Address and Mask
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Ip Source Parameters : ");
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Ip Source Parameters :\n");
 
 		CopyIpAddrToClassifier(pstClassifierEntry,
 	   	psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength,
@@ -371,7 +391,8 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 		eSrcIpAddress);
 
 		//TOS
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"TOS Length:0x%X ",psfCSType->cCPacketClassificationRule.u8IPTypeOfServiceLength);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "TOS Length:0x%X\n",
+			psfCSType->cCPacketClassificationRule.u8IPTypeOfServiceLength);
 		if(3 == psfCSType->cCPacketClassificationRule.u8IPTypeOfServiceLength)
 		{
 			pstClassifierEntry->ucIPTypeOfServiceLength =
@@ -409,7 +430,8 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
 			Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
 		pstClassifierEntry->ulSFID =
 			Adapter->PackInfo[uiSearchRuleIndex].ulSFID;
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Search Index %d Dir: %d, Index: %d, Vcid: %d\n",
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Search Index %d Dir: %d, Index: %d, Vcid: %d\n",
 			uiSearchRuleIndex, pstClassifierEntry->ucDirection,
 			pstClassifierEntry->uiClassifierRuleIndex,
 			pstClassifierEntry->usVCID_Value);
@@ -537,9 +559,12 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
 
 	Adapter->PackInfo[uiSearchRuleIndex].bValid=TRUE;
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Search Rule Index = %d\n", uiSearchRuleIndex);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"%s: SFID= %x ",__FUNCTION__, ntohl(psfLocalSet->u32SFID));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Updating Queue %d",uiSearchRuleIndex);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Search Rule Index = %d\n", uiSearchRuleIndex);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "%s: SFID= %x\n",
+		__func__, ntohl(psfLocalSet->u32SFID));
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Updating Queue %d\n", uiSearchRuleIndex);
 
 	ulSFID = ntohl(psfLocalSet->u32SFID);
 	//Store IP Version used
@@ -549,7 +574,9 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 	Adapter->PackInfo[uiSearchRuleIndex].bEthCSSupport = 0;
 
 	/*Enable IP/ETh CS Support As Required*/
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"CopyToAdapter : u8CSSpecification : %X\n",psfLocalSet->u8CSSpecification);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"CopyToAdapter : u8CSSpecification : %X\n",
+		psfLocalSet->u8CSSpecification);
 	switch(psfLocalSet->u8CSSpecification)
 	{
 		case eCSPacketIPV4:
@@ -588,13 +615,15 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
 		default:
 		{
-            BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Error in value of CS Classification.. setting default to IP CS\n");
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"Error in value of CS Classification.. setting default to IP CS\n");
 			Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport = IPV4_CS;
 			break;
 		}
 	}
 
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"CopyToAdapter : Queue No : %X ETH CS Support :  %X  , IP CS Support : %X   \n",
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"CopyToAdapter : Queue No : %X ETH CS Support :  %X  , IP CS Support : %X\n",
 		uiSearchRuleIndex,
 		Adapter->PackInfo[uiSearchRuleIndex].bEthCSSupport,
 		Adapter->PackInfo[uiSearchRuleIndex].bIPCSSupport);
@@ -637,9 +666,11 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 	//copy all the classifier in the Service Flow param  structure
 	for(nIndex=0; nIndex<psfLocalSet->u8TotalClassifiers; nIndex++)
 	{
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Classifier index =%d",nIndex);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Classifier index =%d\n", nIndex);
 		psfCSType =  &psfLocalSet->cConvergenceSLTypes[nIndex];
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Classifier index =%d",nIndex);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Classifier index =%d\n", nIndex);
 
 		if(psfCSType->cCPacketClassificationRule.u8ClassifierRulePriority)
 		{
@@ -699,7 +730,8 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 				if(nClassifierIndex > MAX_CLASSIFIERS)
 				{
 					//Failed To get a free Entry
-					BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Error Failed To get a free Classifier Entry");
+					bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+						"Error Failed To get a free Classifier Entry\n");
 					break;
 				}
 				//Copy the Classifier Rule for this service flow into our Classifier table maintained per SF.
@@ -709,8 +741,9 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 			else
 			{
 				//This Classifier Already Exists and it is invalid to Add Classifier with existing PCRI
-				BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"CopyToAdapter : Error The Specified Classifier Already Exists \
-						and attempted To Add Classifier with Same PCRI : 0x%x\n", u16PacketClassificationRuleIndex);
+				bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+					"CopyToAdapter : Error The Specified Classifier Already Exists and attempted To Add Classifier with Same PCRI : 0x%x\n",
+					u16PacketClassificationRuleIndex);
 			}
 		}
 		break;
@@ -723,7 +756,8 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 			if(nClassifierIndex > MAX_CLASSIFIERS)
 			{
 				//Failed To search the classifier
-				BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Error Search for Classifier To be replaced failed");
+				bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+					"Error Search for Classifier To be replaced failed\n");
 				break;
 			}
 			//Copy the Classifier Rule for this service flow into our Classifier table maintained per SF.
@@ -739,7 +773,8 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 			if(nClassifierIndex > MAX_CLASSIFIERS)
 			{
 				//Failed To search the classifier
-				BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Error Search for Classifier To be deleted failed");
+				bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+					"Error Search for Classifier To be deleted failed\n");
 				break;
 			}
 
@@ -761,14 +796,17 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 	{
 		psfCSType =  &psfLocalSet->cConvergenceSLTypes[nIndex];
 
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "psfCSType->u8PhsDSCAction : 0x%x\n",
-				psfCSType->u8PhsDSCAction );
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"psfCSType->u8PhsDSCAction : 0x%x\n",
+			psfCSType->u8PhsDSCAction );
 
 		switch (psfCSType->u8PhsDSCAction)
 		{
 		case eDeleteAllPHSRules:
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Deleting All PHS Rules For VCID: 0x%X\n",uVCID);
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"Deleting All PHS Rules For VCID: 0x%X\n",
+				uVCID);
 
 			//Delete All the PHS rules for this Service flow
 
@@ -780,7 +818,8 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 		}
 		case eDeletePHSRule:
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"PHS DSC Action = Delete PHS Rule \n");
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"PHS DSC Action = Delete PHS Rule\n");
 
 			if(psfCSType->cPhsRule.u8PHSI)
 			{
@@ -791,7 +830,6 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 			}
 			else
 			{
-				//BCM_DEBUG_PRINT(CONN_MSG,("Error CPHSRule.PHSI is ZERO \n"));
 			}
 			break;
 		}
@@ -799,7 +837,6 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 		{
 			if(ucDsxType == DSC_ACK)
 			{
-				//BCM_DEBUG_PRINT(CONN_MSG,("Invalid PHS DSC Action For DSC \n",psfCSType->cPhsRule.u8PHSI));
 				break; //FOr DSC ACK Case PHS DSC Action must be in valid set
 			}
 		}
@@ -821,7 +858,8 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 							(Adapter->astClassifierTable[uiClassifierIndex].ulSFID == Adapter->PackInfo[uiSearchRuleIndex].ulSFID) &&
 							(Adapter->astClassifierTable[uiClassifierIndex].u8AssociatedPHSI == psfCSType->cPhsRule.u8PHSI))
 						{
-							BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Adding  PHS Rule For  Classifier : 0x%x cPhsRule.u8PHSI : 0x%x\n",
+							bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+								"Adding  PHS Rule For  Classifier : 0x%x cPhsRule.u8PHSI : 0x%x\n",
 								Adapter->astClassifierTable[uiClassifierIndex].uiClassifierRuleIndex,
 								psfCSType->cPhsRule.u8PHSI);
 							//Update The PHS Rule for this classifier as Associated PHSI id defined
@@ -962,8 +1000,10 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 	}
 
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"LAT: %d, UGI: %d \n", Adapter->PackInfo[uiSearchRuleIndex].uiMaxLatency, UGIValue);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"uiMaxAllowedRate: 0x%x, u32MaxSustainedTrafficRate: 0x%x ,uiMaxBucketSize: 0x%x",
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "LAT: %d, UGI: %d\n",
+		Adapter->PackInfo[uiSearchRuleIndex].uiMaxLatency, UGIValue);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"uiMaxAllowedRate: 0x%x, u32MaxSustainedTrafficRate: 0x%x ,uiMaxBucketSize: 0x%x\n",
 		Adapter->PackInfo[uiSearchRuleIndex].uiMaxAllowedRate,
 		ntohl(psfLocalSet->u32MaxSustainedTrafficRate),
 		Adapter->PackInfo[uiSearchRuleIndex].uiMaxBucketSize);
@@ -988,7 +1028,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
 
 	DumpPhsRules(&Adapter->stBCMPhsContext);
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"%s <=====", __FUNCTION__);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "%s <=====\n", __func__);
 }
 
 
@@ -1012,100 +1052,145 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	pstAddIndication = (stLocalSFAddIndicationAlt *)pvBuffer;
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "======>");
-
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Type		: 0x%X",pstAddIndication->u8Type);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Direction	: 0x%X",pstAddIndication->u8Direction);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u16TID: 0x%X", ntohs(pstAddIndication->u16TID));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u16CID		: 0x%X",ntohs(pstAddIndication->u16CID));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u16VCID		: 0x%X",ntohs(pstAddIndication->u16VCID));
-
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " AuthorizedSet--->");
-
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32SFID		: 0x%X",htonl(pstAddIndication->sfAuthorizedSet.u32SFID));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16CID		: 0x%X",htons(pstAddIndication->sfAuthorizedSet.u16CID));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ServiceClassNameLength	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "======>\n");
+
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8Type		: 0x%X\n", pstAddIndication->u8Type);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8Direction	: 0x%X\n", pstAddIndication->u8Direction);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16TID: 0x%X\n", ntohs(pstAddIndication->u16TID));
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16CID		: 0x%X\n", ntohs(pstAddIndication->u16CID));
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16VCID		: 0x%X\n",
+		ntohs(pstAddIndication->u16VCID));
+
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "AuthorizedSet--->\n");
+
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32SFID		: 0x%X\n",
+		htonl(pstAddIndication->sfAuthorizedSet.u32SFID));
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16CID		: 0x%X\n",
+		htons(pstAddIndication->sfAuthorizedSet.u16CID));
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ServiceClassNameLength	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8ServiceClassNameLength);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8ServiceClassName		: 0x%X ,0x%X , 0x%X, 0x%X, 0x%X, 0x%X",
-			pstAddIndication->sfAuthorizedSet.u8ServiceClassName[0],
-			pstAddIndication->sfAuthorizedSet.u8ServiceClassName[1],
-			pstAddIndication->sfAuthorizedSet.u8ServiceClassName[2],
-			pstAddIndication->sfAuthorizedSet.u8ServiceClassName[3],
-			pstAddIndication->sfAuthorizedSet.u8ServiceClassName[4],
-			pstAddIndication->sfAuthorizedSet.u8ServiceClassName[5]);
-
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8MBSService		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ServiceClassName		: 0x%X ,0x%X , 0x%X, 0x%X, 0x%X, 0x%X\n",
+		pstAddIndication->sfAuthorizedSet.u8ServiceClassName[0],
+		pstAddIndication->sfAuthorizedSet.u8ServiceClassName[1],
+		pstAddIndication->sfAuthorizedSet.u8ServiceClassName[2],
+		pstAddIndication->sfAuthorizedSet.u8ServiceClassName[3],
+		pstAddIndication->sfAuthorizedSet.u8ServiceClassName[4],
+		pstAddIndication->sfAuthorizedSet.u8ServiceClassName[5]);
+
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8MBSService		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8MBSService);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8QosParamSet		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8QosParamSet		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8QosParamSet);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficPriority	: 0x%X, %p",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8TrafficPriority	: 0x%X, %p\n",
 		pstAddIndication->sfAuthorizedSet.u8TrafficPriority, &pstAddIndication->sfAuthorizedSet.u8TrafficPriority);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaxSustainedTrafficRate	: 0x%X 0x%p",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MaxSustainedTrafficRate	: 0x%X 0x%p\n",
 		pstAddIndication->sfAuthorizedSet.u32MaxSustainedTrafficRate,
-			&pstAddIndication->sfAuthorizedSet.u32MaxSustainedTrafficRate);
+		&pstAddIndication->sfAuthorizedSet.u32MaxSustainedTrafficRate);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MaxTrafficBurst			: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MaxTrafficBurst			: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u32MaxTrafficBurst);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinReservedTrafficRate	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MinReservedTrafficRate	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u32MinReservedTrafficRate);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParamLength	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8VendorSpecificQoSParamLength	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8VendorSpecificQoSParamLength);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParam		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8VendorSpecificQoSParam		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8VendorSpecificQoSParam[0]);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8ServiceFlowSchedulingType		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ServiceFlowSchedulingType		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8ServiceFlowSchedulingType);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32ToleratedJitter				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32ToleratedJitter				: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u32ToleratedJitter);
-    BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaximumLatency				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MaximumLatency				: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u32MaximumLatency);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8FixedLengthVSVariableLengthSDUIndicator: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8FixedLengthVSVariableLengthSDUIndicator: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8FixedLengthVSVariableLengthSDUIndicator);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8SDUSize				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8SDUSize				: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8SDUSize);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16TargetSAID			: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16TargetSAID			: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16TargetSAID);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ARQEnable				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ARQEnable				: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8ARQEnable);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u16ARQWindowSize		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQWindowSize		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16ARQWindowSize);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u16ARQRetryTxTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQRetryTxTimeOut	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16ARQRetryTxTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQRetryRxTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQRetryRxTimeOut	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16ARQRetryRxTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u16ARQBlockLifeTime		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQBlockLifeTime		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16ARQBlockLifeTime);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQSyncLossTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQSyncLossTimeOut	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16ARQSyncLossTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ARQDeliverInOrder		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ARQDeliverInOrder		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8ARQDeliverInOrder);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQRxPurgeTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQRxPurgeTimeOut	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16ARQRxPurgeTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQBlockSize			: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQBlockSize			: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16ARQBlockSize);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8CSSpecification		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8CSSpecification		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8CSSpecification);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TypeOfDataDeliveryService	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8TypeOfDataDeliveryService	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8TypeOfDataDeliveryService);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16SDUInterArrivalTime	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16SDUInterArrivalTime	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16SDUInterArrivalTime);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16TimeBase				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16TimeBase				: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16TimeBase);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8PagingPreference		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8PagingPreference		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8PagingPreference);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16UnsolicitedPollingInterval		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16UnsolicitedPollingInterval		: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u16UnsolicitedPollingInterval);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "sfAuthorizedSet.u8HARQChannelMapping %x  %x %x ",
-				*(unsigned int*)pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping,
-				*(unsigned int*)&pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping[4],
-			*(USHORT*) &pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping[8]);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficIndicationPreference	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"sfAuthorizedSet.u8HARQChannelMapping %x  %x %x\n",
+		*(unsigned int*)pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping,
+		*(unsigned int*)&pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping[4],
+		*(USHORT*) &pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping[8]);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8TrafficIndicationPreference	: 0x%X\n",
 		pstAddIndication->sfAuthorizedSet.u8TrafficIndicationPreference);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " Total Classifiers Received		: 0x%X",pstAddIndication->sfAuthorizedSet.u8TotalClassifiers);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"Total Classifiers Received		: 0x%X\n",
+		pstAddIndication->sfAuthorizedSet.u8TotalClassifiers);
 
 	nCurClassifierCnt = pstAddIndication->sfAuthorizedSet.u8TotalClassifiers;
 
@@ -1113,8 +1198,12 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 	{
 		nCurClassifierCnt = MAX_CLASSIFIERS_IN_SF;
 	}
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "pstAddIndication->sfAuthorizedSet.bValid %d", pstAddIndication->sfAuthorizedSet.bValid);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "pstAddIndication->sfAuthorizedSet.u16MacOverhead %x", pstAddIndication->sfAuthorizedSet.u16MacOverhead);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"pstAddIndication->sfAuthorizedSet.bValid %d\n",
+		pstAddIndication->sfAuthorizedSet.bValid);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"pstAddIndication->sfAuthorizedSet.u16MacOverhead %x\n",
+		pstAddIndication->sfAuthorizedSet.u16MacOverhead);
 	if(!pstAddIndication->sfAuthorizedSet.bValid)
 		pstAddIndication->sfAuthorizedSet.bValid=1;
 	for(nIndex = 0 ; nIndex < nCurClassifierCnt ; nIndex++)
@@ -1122,57 +1211,73 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 		stConvergenceSLTypes *psfCSType = NULL;
 		psfCSType =  &pstAddIndication->sfAuthorizedSet.cConvergenceSLTypes[nIndex];
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "psfCSType = %p", psfCSType);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "CCPacketClassificationRuleSI====>");
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"psfCSType = %p\n", psfCSType);
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"CCPacketClassificationRuleSI====>\n");
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ClassifierRulePriority		:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ClassifierRulePriority		:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8ClassifierRulePriority);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPTypeOfServiceLength			:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPTypeOfServiceLength			:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfServiceLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPTypeOfService[3]			:0x%X ,0x%X ,0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPTypeOfService[3]			:0x%X ,0x%X ,0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
 
 		for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Protocol : 0x%02X ",
-			psfCSType->cCPacketClassificationRule.u8Protocol);
+			bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+				"u8Protocol : 0x%02X\n",
+				psfCSType->cCPacketClassificationRule.u8Protocol);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPMaskedSourceAddressLength	:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPMaskedSourceAddressLength	:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength);
 
 		for(uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++)
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPMaskedSourceAddress[32]	: 0x%02X ",
-			psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]);
+			bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+				"u8IPMaskedSourceAddress[32]	: 0x%02X\n",
+				psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPDestinationAddressLength : 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPDestinationAddressLength : 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength);
 
 		for(uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++)
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPDestinationAddress[32] : 0x%02X ",
-			psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]);
+			bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+				"u8IPDestinationAddress[32] : 0x%02X\n",
+				psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolSourcePortRangeLength:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolSourcePortRangeLength:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolSourcePortRange[4]: 0x%02X ,0x%02X ,0x%02X ,0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolSourcePortRange[4]: 0x%02X ,0x%02X ,0x%02X ,0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[0],
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[1],
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[2],
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[3]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolDestPortRangeLength : 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolDestPortRangeLength : 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolDestPortRange[4]: 0x%02X ,0x%02X ,0x%02X ,0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolDestPortRange[4]: 0x%02X ,0x%02X ,0x%02X ,0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[0],
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[1],
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[2],
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[3]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthernetDestMacAddressLength : 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetDestMacAddressLength : 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthernetDestMacAddress[6] : 0x %02X %02X %02X %02X %02X %02X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetDestMacAddress[6] : 0x %02X %02X %02X %02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[0],
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[1],
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[2],
@@ -1180,10 +1285,12 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[4],
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[5]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthernetSourceMACAddressLength : 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetSourceMACAddressLength : 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthernetSourceMACAddress[6] : 0x %02X %02X %02X %02X %02X %02X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetSourceMACAddress[6] : 0x %02X %02X %02X %02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[0],
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[1],
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[2],
@@ -1191,34 +1298,44 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[4],
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[5]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthertypeLength	: 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthertypeLength	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthertypeLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Ethertype[3] : 0x%02X ,0x%02X ,0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8Ethertype[3] : 0x%02X ,0x%02X ,0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8Ethertype[0],
 			psfCSType->cCPacketClassificationRule.u8Ethertype[1],
 			psfCSType->cCPacketClassificationRule.u8Ethertype[2]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16UserPriority		: 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u16UserPriority		: 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16UserPriority);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16VLANID			: 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u16VLANID			: 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16VLANID);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8AssociatedPHSI	: 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8AssociatedPHSI	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8AssociatedPHSI);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16PacketClassificationRuleIndex : 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u16PacketClassificationRuleIndex : 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16PacketClassificationRuleIndex);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificClassifierParamLength	: 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8VendorSpecificClassifierParamLength	: 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParamLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificClassifierParam[1]		: 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8VendorSpecificClassifierParam[1]		: 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParam[0]);
 #ifdef VERSION_D5
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPv6FlowLableLength				:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPv6FlowLabelLength				:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLableLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPv6FlowLable[6] : 0x %02X %02X %02X %02X %02X %02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPv6FlowLabel[6] : 0x %02X %02X %02X %02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLable[0],
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLable[1],
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLable[2],
@@ -1228,86 +1345,124 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 #endif
 	}
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "bValid		: 0x%02X",pstAddIndication->sfAuthorizedSet.bValid);
-
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "AdmittedSet--->");
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32SFID		: 0x%X",pstAddIndication->sfAdmittedSet.u32SFID);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16CID		: 0x%X",pstAddIndication->sfAdmittedSet.u16CID);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ServiceClassNameLength	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"bValid		: 0x%02X\n",
+		pstAddIndication->sfAuthorizedSet.bValid);
+
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "AdmittedSet--->\n");
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32SFID		: 0x%X\n",
+		pstAddIndication->sfAdmittedSet.u32SFID);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16CID		: 0x%X\n",
+		pstAddIndication->sfAdmittedSet.u16CID);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ServiceClassNameLength	: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u8ServiceClassNameLength);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ServiceClassName			: 0x %02X %02X %02X %02X %02X %02X",
-			pstAddIndication->sfAdmittedSet.u8ServiceClassName[0],
-			pstAddIndication->sfAdmittedSet.u8ServiceClassName[1],
-			pstAddIndication->sfAdmittedSet.u8ServiceClassName[2],
-			pstAddIndication->sfAdmittedSet.u8ServiceClassName[3],
-			pstAddIndication->sfAdmittedSet.u8ServiceClassName[4],
-			pstAddIndication->sfAdmittedSet.u8ServiceClassName[5]);
-
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8MBSService				: 0x%02X",
-			pstAddIndication->sfAdmittedSet.u8MBSService);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8QosParamSet				: 0x%02X",
-			pstAddIndication->sfAdmittedSet.u8QosParamSet);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficPriority			: 0x%02X",
-			pstAddIndication->sfAdmittedSet.u8TrafficPriority);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaxTrafficBurst			: 0x%X",
-			pstAddIndication->sfAdmittedSet.u32MaxTrafficBurst);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MinReservedTrafficRate	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ServiceClassName			: 0x %02X %02X %02X %02X %02X %02X\n",
+		pstAddIndication->sfAdmittedSet.u8ServiceClassName[0],
+		pstAddIndication->sfAdmittedSet.u8ServiceClassName[1],
+		pstAddIndication->sfAdmittedSet.u8ServiceClassName[2],
+		pstAddIndication->sfAdmittedSet.u8ServiceClassName[3],
+		pstAddIndication->sfAdmittedSet.u8ServiceClassName[4],
+		pstAddIndication->sfAdmittedSet.u8ServiceClassName[5]);
+
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8MBSService				: 0x%02X\n",
+		pstAddIndication->sfAdmittedSet.u8MBSService);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8QosParamSet				: 0x%02X\n",
+		pstAddIndication->sfAdmittedSet.u8QosParamSet);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8TrafficPriority			: 0x%02X\n",
+		pstAddIndication->sfAdmittedSet.u8TrafficPriority);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MaxTrafficBurst			: 0x%X\n",
+		pstAddIndication->sfAdmittedSet.u32MaxTrafficBurst);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MinReservedTrafficRate	: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u32MinReservedTrafficRate);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificQoSParamLength	: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8VendorSpecificQoSParamLength	: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8VendorSpecificQoSParamLength);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificQoSParam		: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8VendorSpecificQoSParam		: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8VendorSpecificQoSParam[0]);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ServiceFlowSchedulingType		: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ServiceFlowSchedulingType		: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8ServiceFlowSchedulingType);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32ToleratedJitter				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32ToleratedJitter				: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u32ToleratedJitter);
-    BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaximumLatency				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MaximumLatency				: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u32MaximumLatency);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8FixedLengthVSVariableLengthSDUIndicator: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8FixedLengthVSVariableLengthSDUIndicator: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8FixedLengthVSVariableLengthSDUIndicator);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8SDUSize			: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8SDUSize			: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8SDUSize);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16TargetSAID		: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16TargetSAID		: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u16TargetSAID);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ARQEnable			: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ARQEnable			: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8ARQEnable);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQWindowSize		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQWindowSize		: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u16ARQWindowSize);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQRetryTxTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQRetryTxTimeOut	: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u16ARQRetryTxTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQRetryRxTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQRetryRxTimeOut	: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u16ARQRetryRxTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQBlockLifeTime		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQBlockLifeTime		: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u16ARQBlockLifeTime);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQSyncLossTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQSyncLossTimeOut	: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u16ARQSyncLossTimeOut);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ARQDeliverInOrder		: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ARQDeliverInOrder		: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8ARQDeliverInOrder);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQRxPurgeTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQRxPurgeTimeOut	: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u16ARQRxPurgeTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16ARQBlockSize			: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQBlockSize			: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u16ARQBlockSize);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8CSSpecification		: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8CSSpecification		: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8CSSpecification);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TypeOfDataDeliveryService	: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8TypeOfDataDeliveryService	: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8TypeOfDataDeliveryService);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16SDUInterArrivalTime	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16SDUInterArrivalTime	: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u16SDUInterArrivalTime);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16TimeBase				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16TimeBase				: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u16TimeBase);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8PagingPreference		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8PagingPreference		: 0x%X\n",
 		pstAddIndication->sfAdmittedSet.u8PagingPreference);
 
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficIndicationPreference	: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8TrafficIndicationPreference	: 0x%02X\n",
 		pstAddIndication->sfAdmittedSet.u8TrafficIndicationPreference);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " Total Classifiers Received		: 0x%X",pstAddIndication->sfAdmittedSet.u8TotalClassifiers);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"Total Classifiers Received		: 0x%X\n",
+		pstAddIndication->sfAdmittedSet.u8TotalClassifiers);
 
 	nCurClassifierCnt = pstAddIndication->sfAdmittedSet.u8TotalClassifiers;
 
@@ -1323,57 +1478,72 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 		stConvergenceSLTypes *psfCSType = NULL;
 		psfCSType =  &pstAddIndication->sfAdmittedSet.cConvergenceSLTypes[nIndex];
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " CCPacketClassificationRuleSI====>");
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"CCPacketClassificationRuleSI====>\n");
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ClassifierRulePriority	:0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ClassifierRulePriority	:0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8ClassifierRulePriority);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPTypeOfServiceLength		:0x%02X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPTypeOfServiceLength		:0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfServiceLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPTypeOfService[3]		:0x%02X %02X %02X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPTypeOfService[3]		:0x%02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
 		for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Protocol: 0x%02X ",
-			psfCSType->cCPacketClassificationRule.u8Protocol);
+			bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+				"u8Protocol: 0x%02X\n",
+				psfCSType->cCPacketClassificationRule.u8Protocol);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPMaskedSourceAddressLength	:0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPMaskedSourceAddressLength	:0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength);
 
 		for(uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++)
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPMaskedSourceAddress[32] : 0x%02X ",
-			psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]);
+			bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+				"u8IPMaskedSourceAddress[32] : 0x%02X\n",
+				psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPDestinationAddressLength	: 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPDestinationAddressLength	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength);
 
 		for(uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++)
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPDestinationAddress[32] : 0x%02X ",
-			psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]);
+			bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+				"u8IPDestinationAddress[32] : 0x%02X\n",
+				psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolSourcePortRangeLength	: 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolSourcePortRangeLength	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolSourcePortRange[4] : 0x %02X %02X %02X %02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolSourcePortRange[4] : 0x %02X %02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[0],
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[1],
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[2],
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[3]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolDestPortRangeLength : 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolDestPortRangeLength : 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolDestPortRange[4] : 0x %02X %02X %02X %02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolDestPortRange[4] : 0x %02X %02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[0],
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[1],
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[2],
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[3]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthernetDestMacAddressLength : 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetDestMacAddressLength : 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthernetDestMacAddress[6] : 0x %02X %02X %02X %02X %02X %02X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetDestMacAddress[6] : 0x %02X %02X %02X %02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[0],
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[1],
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[2],
@@ -1381,10 +1551,12 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[4],
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[5]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthernetSourceMACAddressLength : 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetSourceMACAddressLength : 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthernetSourceMACAddress[6] : 0x %02X %02X %02X %02X %02X %02X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetSourceMACAddress[6] : 0x %02X %02X %02X %02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[0],
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[1],
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[2],
@@ -1392,30 +1564,40 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[4],
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[5]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthertypeLength  	: 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthertypeLength  	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthertypeLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Ethertype[3]		: 0x%02X %02X %02X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8Ethertype[3]		: 0x%02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8Ethertype[0],
 			psfCSType->cCPacketClassificationRule.u8Ethertype[1],
 			psfCSType->cCPacketClassificationRule.u8Ethertype[2]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16UserPriority 	: 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u16UserPriority 	: 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16UserPriority);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16VLANID			: 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u16VLANID			: 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16VLANID);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8AssociatedPHSI	: 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8AssociatedPHSI	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8AssociatedPHSI);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16PacketClassificationRuleIndex	: 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u16PacketClassificationRuleIndex	: 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16PacketClassificationRuleIndex);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificClassifierParamLength	: 0x%02X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8VendorSpecificClassifierParamLength	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParamLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificClassifierParam[1] 	: 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8VendorSpecificClassifierParam[1] 	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParam[0]);
 #ifdef VERSION_D5
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPv6FlowLableLength				: 0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPv6FlowLabelLength				: 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLableLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPv6FlowLable[6]	: 0x %02X %02X %02X %02X %02X %02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPv6FlowLabel[6]	: 0x %02X %02X %02X %02X %02X %02X\n",
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLable[0],
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLable[1],
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLable[2],
@@ -1425,16 +1607,24 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 #endif
 	}
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "bValid		: 0x%X",pstAddIndication->sfAdmittedSet.bValid);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"bValid		: 0x%X\n",
+		pstAddIndication->sfAdmittedSet.bValid);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " ActiveSet--->");
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32SFID		: 0x%X",pstAddIndication->sfActiveSet.u32SFID);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16CID		: 0x%X",pstAddIndication->sfActiveSet.u16CID);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "ActiveSet--->\n");
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32SFID		: 0x%X\n",
+		pstAddIndication->sfActiveSet.u32SFID);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16CID		: 0x%X\n",
+		pstAddIndication->sfActiveSet.u16CID);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ServiceClassNameLength	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ServiceClassNameLength	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u8ServiceClassNameLength);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ServiceClassName		: 0x %02X %02X %02X %02X %02X %02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ServiceClassName		: 0x %02X %02X %02X %02X %02X %02X\n",
 		pstAddIndication->sfActiveSet.u8ServiceClassName[0],
 		pstAddIndication->sfActiveSet.u8ServiceClassName[1],
 		pstAddIndication->sfActiveSet.u8ServiceClassName[2],
@@ -1442,69 +1632,99 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 		pstAddIndication->sfActiveSet.u8ServiceClassName[4],
 		pstAddIndication->sfActiveSet.u8ServiceClassName[5]);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8MBSService				: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8MBSService				: 0x%02X\n",
 		pstAddIndication->sfActiveSet.u8MBSService);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8QosParamSet				: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8QosParamSet				: 0x%02X\n",
 		pstAddIndication->sfActiveSet.u8QosParamSet);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficPriority			: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8TrafficPriority			: 0x%02X\n",
 		pstAddIndication->sfActiveSet.u8TrafficPriority);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaxTrafficBurst			: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MaxTrafficBurst			: 0x%X\n",
 		pstAddIndication->sfActiveSet.u32MaxTrafficBurst);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MinReservedTrafficRate	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MinReservedTrafficRate	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u32MinReservedTrafficRate);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificQoSParamLength	: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8VendorSpecificQoSParamLength	: 0x%02X\n",
 		pstAddIndication->sfActiveSet.u8VendorSpecificQoSParamLength);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificQoSParam		: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8VendorSpecificQoSParam		: 0x%02X\n",
 		pstAddIndication->sfActiveSet.u8VendorSpecificQoSParam[0]);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ServiceFlowSchedulingType		: 0x%02X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ServiceFlowSchedulingType		: 0x%02X\n",
 		pstAddIndication->sfActiveSet.u8ServiceFlowSchedulingType);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32ToleratedJitter				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32ToleratedJitter				: 0x%X\n",
 		pstAddIndication->sfActiveSet.u32ToleratedJitter);
-    BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaximumLatency				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u32MaximumLatency				: 0x%X\n",
 		pstAddIndication->sfActiveSet.u32MaximumLatency);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8FixedLengthVSVariableLengthSDUIndicator: 0x%02X",
-	   pstAddIndication->sfActiveSet.u8FixedLengthVSVariableLengthSDUIndicator);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8FixedLengthVSVariableLengthSDUIndicator: 0x%02X\n",
+		pstAddIndication->sfActiveSet.u8FixedLengthVSVariableLengthSDUIndicator);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8SDUSize				: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8SDUSize				: 0x%X\n",
 		pstAddIndication->sfActiveSet.u8SDUSize);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16TargetSAID			: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16TargetSAID			: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16TargetSAID);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8ARQEnable			: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ARQEnable			: 0x%X\n",
 		pstAddIndication->sfActiveSet.u8ARQEnable);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16ARQWindowSize		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQWindowSize		: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16ARQWindowSize);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16ARQRetryTxTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQRetryTxTimeOut	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16ARQRetryTxTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16ARQRetryRxTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQRetryRxTimeOut	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16ARQRetryRxTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16ARQBlockLifeTime	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQBlockLifeTime	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16ARQBlockLifeTime);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16ARQSyncLossTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQSyncLossTimeOut	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16ARQSyncLossTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8ARQDeliverInOrder	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8ARQDeliverInOrder	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u8ARQDeliverInOrder);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16ARQRxPurgeTimeOut	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQRxPurgeTimeOut	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16ARQRxPurgeTimeOut);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16ARQBlockSize		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16ARQBlockSize		: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16ARQBlockSize);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8CSSpecification		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8CSSpecification		: 0x%X\n",
 		pstAddIndication->sfActiveSet.u8CSSpecification);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8TypeOfDataDeliveryService	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8TypeOfDataDeliveryService	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u8TypeOfDataDeliveryService);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16SDUInterArrivalTime	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16SDUInterArrivalTime	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16SDUInterArrivalTime);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16TimeBase			: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u16TimeBase			: 0x%X\n",
 		pstAddIndication->sfActiveSet.u16TimeBase);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8PagingPreference		: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8PagingPreference		: 0x%X\n",
 		pstAddIndication->sfActiveSet.u8PagingPreference);
 
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8TrafficIndicationPreference	: 0x%X",
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"u8TrafficIndicationPreference	: 0x%X\n",
 		pstAddIndication->sfActiveSet.u8TrafficIndicationPreference);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " Total Classifiers Received		: 0x%X",pstAddIndication->sfActiveSet.u8TotalClassifiers);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"Total Classifiers Received		: 0x%X\n",
+		pstAddIndication->sfActiveSet.u8TotalClassifiers);
 
 	nCurClassifierCnt = pstAddIndication->sfActiveSet.u8TotalClassifiers;
 
@@ -1520,57 +1740,72 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 		psfCSType =  &pstAddIndication->sfActiveSet.cConvergenceSLTypes[nIndex];
 
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " CCPacketClassificationRuleSI====>");
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"CCPacketClassificationRuleSI====>\n");
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8ClassifierRulePriority		:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ClassifierRulePriority		:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8ClassifierRulePriority);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8IPTypeOfServiceLength		:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPTypeOfServiceLength		:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfServiceLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8IPTypeOfService[3]			:0x%X ,0x%X ,0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPTypeOfService[3]			:0x%X ,0x%X ,0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
 			psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
 		for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8Protocol	: 0x%X ",
-			psfCSType->cCPacketClassificationRule.u8Protocol);
+			bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+				"u8Protocol	: 0x%X\n",
+				psfCSType->cCPacketClassificationRule.u8Protocol);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPMaskedSourceAddressLength	:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPMaskedSourceAddressLength	:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength);
 
 		for(uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++)
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPMaskedSourceAddress[32]:0x%X ",
-			psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]);
+			bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+				"u8IPMaskedSourceAddress[32]:0x%X\n",
+				psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8IPDestinationAddressLength : 0x%02X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPDestinationAddressLength : 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength);
 
 		for(uiLoopIndex=0;uiLoopIndex<32;uiLoopIndex++)
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8IPDestinationAddress[32]:0x%X ",
-			psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]);
+			bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+				"u8IPDestinationAddress[32]:0x%X\n",
+				psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8ProtocolSourcePortRangeLength:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolSourcePortRangeLength:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRangeLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8ProtocolSourcePortRange[4]:0x%X ,0x%X ,0x%X ,0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolSourcePortRange[4]:0x%X ,0x%X ,0x%X ,0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[0],
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[1],
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[2],
 			psfCSType->cCPacketClassificationRule.u8ProtocolSourcePortRange[3]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8ProtocolDestPortRangeLength:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolDestPortRangeLength:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8ProtocolDestPortRange[4]:0x%X ,0x%X ,0x%X ,0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8ProtocolDestPortRange[4]:0x%X ,0x%X ,0x%X ,0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[0],
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[1],
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[2],
 			psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange[3]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8EthernetDestMacAddressLength:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetDestMacAddressLength:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8EthernetDestMacAddress[6]:0x%X ,0x%X ,0x%X ,0x%X ,0x%X ,0x%X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetDestMacAddress[6]:0x%X ,0x%X ,0x%X ,0x%X ,0x%X ,0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[0],
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[1],
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[2],
@@ -1578,10 +1813,12 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[4],
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[5]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8EthernetSourceMACAddressLength:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetSourceMACAddressLength:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8EthernetSourceMACAddress[6]:0x%X ,0x%X ,0x%X ,0x%X ,0x%X ,0x%X",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthernetSourceMACAddress[6]:0x%X ,0x%X ,0x%X ,0x%X ,0x%X ,0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[0],
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[1],
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[2],
@@ -1589,29 +1826,39 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[4],
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[5]);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8EthertypeLength              :0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8EthertypeLength              :0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8EthertypeLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8Ethertype[3]                 :0x%X ,0x%X ,0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8Ethertype[3]                 :0x%X ,0x%X ,0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8Ethertype[0],
 			psfCSType->cCPacketClassificationRule.u8Ethertype[1],
 			psfCSType->cCPacketClassificationRule.u8Ethertype[2]);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16UserPriority                :0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u16UserPriority                :0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16UserPriority);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16VLANID                      :0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u16VLANID                      :0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16VLANID);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8AssociatedPHSI               :0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8AssociatedPHSI               :0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8AssociatedPHSI);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u16PacketClassificationRuleIndex:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u16PacketClassificationRuleIndex:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16PacketClassificationRuleIndex);
 
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8VendorSpecificClassifierParamLength:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8VendorSpecificClassifierParamLength:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParamLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8VendorSpecificClassifierParam[1]:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8VendorSpecificClassifierParam[1]:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParam[0]);
 #ifdef VERSION_D5
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8IPv6FlowLableLength				:0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPv6FlowLabelLength				:0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLableLength);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8IPv6FlowLable[6]	    :0x%X ,0x%X ,0x%X ,0x%X ,0x%X ,0x%X ",
+		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+			"u8IPv6FlowLabel[6]	    :0x%X ,0x%X ,0x%X ,0x%X ,0x%X ,0x%X\n",
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLable[0],
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLable[1],
 			psfCSType->cCPacketClassificationRule.u8IPv6FlowLable[2],
@@ -1621,7 +1868,9 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 #endif
 	}
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " bValid			: 0x%X",pstAddIndication->sfActiveSet.bValid);
+	bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
+		"bValid			: 0x%X\n",
+		pstAddIndication->sfActiveSet.bValid);
 
 }
 
@@ -1631,7 +1880,8 @@ static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet
 
 	if(ulAddrSFParamSet == 0 || NULL == pucDestBuffer)
 	{
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "Got Param address as 0!!");
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Got Param address as 0!!\n");
 		return 0;
 	}
 	ulAddrSFParamSet = ntohl(ulAddrSFParamSet);
@@ -1656,7 +1906,8 @@ static ULONG StoreSFParam(PMINI_ADAPTER Adapter,PUCHAR pucSrcBuffer,ULONG  ulAdd
 
 	ret = wrm(Adapter, ulAddrSFParamSet, (u8 *)pucSrcBuffer, nBytesToWrite);
 	if (ret < 0) {
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "%s:%d WRM failed",__FUNCTION__, __LINE__);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "%s:%d WRM failed\n",
+			__func__, __LINE__);
 		return ret;
 	}
 	return 1;
@@ -1779,7 +2030,7 @@ static inline stLocalSFAddIndicationAlt
 	stLocalSFAddIndicationAlt *pstAddIndicationDest = NULL;
 	pstAddIndication = (stLocalSFAddIndication *)(pvBuffer);
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "=====>" );
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "=====>\n");
 	if ((pstAddIndication->u8Type == DSD_REQ) ||
 		(pstAddIndication->u8Type == DSD_RSP) ||
 		(pstAddIndication->u8Type == DSD_ACK))
@@ -1787,7 +2038,8 @@ static inline stLocalSFAddIndicationAlt
 		return (stLocalSFAddIndicationAlt *)pvBuffer;
 	}
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Inside RestoreCmControlResponseMessage ");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Inside RestoreCmControlResponseMessage\n");
 	/*
 	//Need to Allocate memory to contain the SUPER Large structures
 	//Our driver can't create these structures on Stack :(
@@ -1800,17 +2052,32 @@ static inline stLocalSFAddIndicationAlt
 	}
 	else
 	{
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Failed to allocate memory for SF Add Indication Structure ");
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Failed to allocate memory for SF Add Indication Structure\n");
 		return NULL;
 	}
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-u8Type : 0x%X",pstAddIndication->u8Type);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-u8Direction : 0x%X",pstAddIndication->eConnectionDir);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-u8TID : 0x%X",ntohs(pstAddIndication->u16TID));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-u8CID : 0x%X",ntohs(pstAddIndication->u16CID));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-u16VCID : 0x%X",ntohs(pstAddIndication->u16VCID));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-autorized set loc : %p",pstAddIndication->psfAuthorizedSet);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-admitted set loc : %p",pstAddIndication->psfAdmittedSet);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-Active set loc : %p",pstAddIndication->psfActiveSet);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"AddIndication-u8Type : 0x%X\n",
+		pstAddIndication->u8Type);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"AddIndication-u8Direction : 0x%X\n",
+		pstAddIndication->eConnectionDir);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "AddIndication-u8TID : 0x%X\n",
+		ntohs(pstAddIndication->u16TID));
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "AddIndication-u8CID : 0x%X\n",
+		ntohs(pstAddIndication->u16CID));
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"AddIndication-u16VCID : 0x%X\n",
+		ntohs(pstAddIndication->u16VCID));
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"AddIndication-autorized set loc : %p\n",
+		pstAddIndication->psfAuthorizedSet);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"AddIndication-admitted set loc : %p\n",
+		pstAddIndication->psfAdmittedSet);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"AddIndication-Active set loc : %p\n",
+		pstAddIndication->psfActiveSet);
 
 	pstAddIndicationDest->u8Type = pstAddIndication->u8Type;
 	pstAddIndicationDest->u8Direction = pstAddIndication->eConnectionDir;
@@ -1819,7 +2086,7 @@ static inline stLocalSFAddIndicationAlt
 	pstAddIndicationDest->u16VCID = pstAddIndication->u16VCID;
 	pstAddIndicationDest->u8CC = pstAddIndication->u8CC;
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "Restoring Active Set ");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Restoring Active Set\n");
 	ulStatus=RestoreSFParam(Adapter,(ULONG)pstAddIndication->psfActiveSet, (PUCHAR)&pstAddIndicationDest->sfActiveSet);
 	if(ulStatus != 1)
 	{
@@ -1828,7 +2095,7 @@ static inline stLocalSFAddIndicationAlt
 	if(pstAddIndicationDest->sfActiveSet.u8TotalClassifiers > MAX_CLASSIFIERS_IN_SF)
 		pstAddIndicationDest->sfActiveSet.u8TotalClassifiers = MAX_CLASSIFIERS_IN_SF;
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "Restoring Admitted Set ");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Restoring Admitted Set\n");
 	ulStatus=RestoreSFParam(Adapter,(ULONG)pstAddIndication->psfAdmittedSet,(PUCHAR)&pstAddIndicationDest->sfAdmittedSet);
 	if(ulStatus != 1)
 	{
@@ -1837,7 +2104,7 @@ static inline stLocalSFAddIndicationAlt
 	if(pstAddIndicationDest->sfAdmittedSet.u8TotalClassifiers > MAX_CLASSIFIERS_IN_SF)
 		pstAddIndicationDest->sfAdmittedSet.u8TotalClassifiers = MAX_CLASSIFIERS_IN_SF;
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "Restoring Authorized Set ");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Restoring Authorized Set\n");
 	ulStatus=RestoreSFParam(Adapter,(ULONG)pstAddIndication->psfAuthorizedSet,(PUCHAR)&pstAddIndicationDest->sfAuthorizedSet);
 	if(ulStatus != 1)
 	{
@@ -1846,15 +2113,20 @@ static inline stLocalSFAddIndicationAlt
 	if(pstAddIndicationDest->sfAuthorizedSet.u8TotalClassifiers > MAX_CLASSIFIERS_IN_SF)
 		pstAddIndicationDest->sfAuthorizedSet.u8TotalClassifiers = MAX_CLASSIFIERS_IN_SF;
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Dumping the whole raw packet");
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "============================================================");
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " pstAddIndicationDest->sfActiveSet size  %zx %p", sizeof(*pstAddIndicationDest), pstAddIndicationDest);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Dumping the whole raw packet\n");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"============================================================\n");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"pstAddIndicationDest->sfActiveSet size  %zx %p\n",
+		sizeof(*pstAddIndicationDest), pstAddIndicationDest);
 	//BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, (unsigned char *)pstAddIndicationDest, sizeof(*pstAddIndicationDest));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "============================================================");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"============================================================\n");
 	return pstAddIndicationDest;
 failed_restore_sf_param:
 	kfree(pstAddIndicationDest);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "<=====" );
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "<=====\n");
 	return NULL;
 }
 
@@ -1866,27 +2138,35 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
 	int Status;
 
 	if (!Adapter) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Adapter was NULL!!!");
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Adapter was NULL!!!\n");
 		return 0;
 	}
 
 	if(Adapter->astTargetDsxBuffer[0].ulTargetDsxBuffer)
 		return 1;
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Size of Each DSX Buffer(Also size of ServiceFlowParamSI): %zx ",sizeof(stServiceFlowParamSI));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Reading DSX buffer From Target location %x ",DSX_MESSAGE_EXCHANGE_BUFFER);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Size of Each DSX Buffer(Also size of ServiceFlowParamSI): %zx\n",
+		sizeof(stServiceFlowParamSI));
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Reading DSX buffer From Target location %x\n",
+		DSX_MESSAGE_EXCHANGE_BUFFER);
 
  	Status = rdmalt(Adapter, DSX_MESSAGE_EXCHANGE_BUFFER,
 					(PUINT)&ulTargetDsxBuffersBase, sizeof(UINT));
 	if(Status < 0)
 	{
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "RDM failed!!");
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "RDM failed!!\n");
 		return 0;
 	}
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Base Address Of DSX  Target Buffer : 0x%lx",ulTargetDsxBuffersBase);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Base Address Of DSX  Target Buffer : 0x%lx\n",
+		ulTargetDsxBuffersBase);
 
-   	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "Tgt Buffer is Now %lx :",ulTargetDsxBuffersBase);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Tgt Buffer is Now %lx :\n",
+		ulTargetDsxBuffersBase);
 
 	ulCntTargetBuffers = DSX_MESSAGE_EXCHANGE_BUFFER_SIZE/sizeof(stServiceFlowParamSI);
 
@@ -1894,7 +2174,9 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
 		ulCntTargetBuffers > MAX_TARGET_DSX_BUFFERS ?
 		MAX_TARGET_DSX_BUFFERS : ulCntTargetBuffers;
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " Total Target DSX Buffer setup %lx ",Adapter->ulTotalTargetBuffersAvailable);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"Total Target DSX Buffer setup %lx\n",
+		Adapter->ulTotalTargetBuffersAvailable);
 
 	for(ulIndex=0; ulIndex < Adapter->ulTotalTargetBuffersAvailable ; ulIndex++)
 	{
@@ -1902,7 +2184,8 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
 		Adapter->astTargetDsxBuffer[ulIndex].valid=1;
 		Adapter->astTargetDsxBuffer[ulIndex].tid=0;
 		ulTargetDsxBuffersBase+=sizeof(stServiceFlowParamSI);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "  Target DSX Buffer %lx setup at 0x%lx",
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"Target DSX Buffer %lx setup at 0x%lx\n",
 			ulIndex, Adapter->astTargetDsxBuffer[ulIndex].ulTargetDsxBuffer);
 	}
 	Adapter->ulCurrentTargetBuffer = 0;
@@ -1933,7 +2216,7 @@ static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,B_UINT16 tid)
 
 	if(ulMaxTry==0)
 	{
-		pr_info(" GetNextTargetBufferLocation : Error No Free Target DSX Buffers FreeCnt : %lx\n",
+		pr_info("GetNextTargetBufferLocation : Error No Free Target DSX Buffers FreeCnt : %lx\n",
 			Adapter->ulFreeTargetBufferCnt);
 		ClearTargetDSXBuffer(Adapter,tid,FALSE);
 		return 0;
@@ -2001,7 +2284,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 	}
 
 	DumpCmControlPacket(pstAddIndication);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "====>");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "====>\n");
 	pLeader = (PLEADER)Adapter->caDsxReqResp;
 
 	pLeader->Status =CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ;
@@ -2014,13 +2297,17 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 		case DSA_REQ:
 		{
 			pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Sending DSA Response....\n");
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "SENDING DSA RESPONSE TO MAC %d", pLeader->PLength );
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"Sending DSA Response....\n");
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"SENDING DSA RESPONSE TO MAC %d\n",
+				pLeader->PLength);
 			*((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))
 						= *pstAddIndication;
 			((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP;
 
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  " VCID = %x", ntohs(pstAddIndication->u16VCID));
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "VCID = %x\n",
+				ntohs(pstAddIndication->u16VCID));
 			CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
 			kfree(pstAddIndication);
 		}
@@ -2028,7 +2315,8 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 		case DSA_RSP:
 		{
 			pLeader->PLength = sizeof(stLocalSFAddIndicationAlt);
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSA ACK TO MAC %d",
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"SENDING DSA ACK TO MAC %d\n",
 				pLeader->PLength);
 			*((stLocalSFAddIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))
 						= *pstAddIndication;
@@ -2039,18 +2327,21 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 		{
 			UINT uiSearchRuleIndex=0;
 
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "VCID:0x%X",
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "VCID:0x%X\n",
 				ntohs(pstAddIndication->u16VCID));
-            uiSearchRuleIndex=SearchFreeSfid(Adapter);
-            BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"uiSearchRuleIndex:0x%X ",
+			uiSearchRuleIndex = SearchFreeSfid(Adapter);
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"uiSearchRuleIndex:0x%X\n",
 				uiSearchRuleIndex);
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Direction:0x%X ",
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"Direction:0x%X\n",
 				pstAddIndication->u8Direction);
 			if((uiSearchRuleIndex< NO_OF_QUEUES) )
 			{
 				Adapter->PackInfo[uiSearchRuleIndex].ucDirection =
 					pstAddIndication->u8Direction;
-                BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "bValid:0x%X ",
+				bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+					"bValid:0x%X\n",
 					pstAddIndication->sfActiveSet.bValid);
 				if(pstAddIndication->sfActiveSet.bValid==TRUE)
 				{
@@ -2094,7 +2385,8 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 
 				else if(psfLocalSet->bValid && (pstAddIndication->u8CC == 0))
 				{
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSA ACK");
+					bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+						"DSA ACK\n");
 					Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value =
 						ntohs(pstAddIndication->u16VCID);
 					Adapter->PackInfo[uiSearchRuleIndex].usCID =
@@ -2152,7 +2444,9 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 		{
 			pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
 			pstChangeIndication	= (stLocalSFChangeIndicationAlt*)pstAddIndication;
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSC RESPONSE TO MAC %d", pLeader->PLength);
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"SENDING DSC RESPONSE TO MAC %d\n",
+				pLeader->PLength);
 
 			*((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
 			((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
@@ -2165,7 +2459,9 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 		{
 			pLeader->PLength = sizeof(stLocalSFChangeIndicationAlt);
 			pstChangeIndication	= (stLocalSFChangeIndicationAlt*)pstAddIndication;
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSC ACK TO MAC %d", pLeader->PLength);
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"SENDING DSC ACK TO MAC %d\n",
+				pLeader->PLength);
 			*((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication;
 			((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_ACK;
 		}
@@ -2254,7 +2550,9 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 
 			ulSFID = ntohl(((stLocalSFDeleteIndication*)pstAddIndication)->u32SFID);
 			uiSearchRuleIndex=SearchSfid(Adapter,ulSFID);
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSD - Removing connection %x",uiSearchRuleIndex);
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"DSD - Removing connection %x\n",
+				uiSearchRuleIndex);
 
 			if(uiSearchRuleIndex < NO_OF_QUEUES)
 			{
@@ -2263,7 +2561,8 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 				Adapter->u32TotalDSD++;
 			}
 
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSD RESPONSE TO MAC");
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"SENDING DSD RESPONSE TO MAC\n");
 			((stLocalSFDeleteIndication*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP;
 			CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
 		}
@@ -2273,7 +2572,8 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 		}
 		break;
 	case DSD_ACK:
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSD ACK Rcd, let App handle it\n");
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"DSD ACK Rcd, let App handle it\n");
 			break;
 	default:
 		kfree(pstAddIndication);
@@ -2286,13 +2586,14 @@ int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __us
 {
 	int status = 0;
 	struct _packet_info *psSfInfo=NULL;
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "status =%d",status);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "status =%d\n", status);
 	status = SearchSfid(Adapter, uiSFId);
 	if (status >= NO_OF_QUEUES) {
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SFID %d not present in queue !!!", uiSFId );
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"SFID %d not present in queue !!!\n", uiSFId);
 		return -EINVAL;
 	}
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "status =%d",status);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "status =%d\n", status);
 	psSfInfo=&Adapter->PackInfo[status];
 	if(psSfInfo->pstSFIndication && copy_to_user(user_buffer,
 		psSfInfo->pstSFIndication, sizeof(stLocalSFAddIndicationAlt)))
@@ -2314,7 +2615,8 @@ VOID OverrideServiceFlowParams(PMINI_ADAPTER Adapter,PUINT puiBuffer)
 
 	puiBuffer+=2;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "u32NumofSFsinMsg: 0x%x\n",u32NumofSFsinMsg);
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+		"u32NumofSFsinMsg: 0x%x\n", u32NumofSFsinMsg);
 
 	while(u32NumofSFsinMsg != 0 && u32NumofSFsinMsg < NO_OF_QUEUES)
 	{
@@ -2324,17 +2626,21 @@ VOID OverrideServiceFlowParams(PMINI_ADAPTER Adapter,PUINT puiBuffer)
 
 		ulSFID = ntohl(pHostInfo->SFID);
 		uiSearchRuleIndex=SearchSfid(Adapter,ulSFID);
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"SFID: 0x%lx\n",ulSFID);
+		bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+			"SFID: 0x%lx\n", ulSFID);
 
 		if(uiSearchRuleIndex >= NO_OF_QUEUES || uiSearchRuleIndex == HiPriority)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"The SFID <%lx> doesn't exist in host entry or is Invalid\n", ulSFID);
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"The SFID <%lx> doesn't exist in host entry or is Invalid\n",
+				ulSFID);
 			continue;
 		}
 
 		if(pHostInfo->RetainSF == FALSE)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"Going to Delete SF");
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"Going to Delete SF\n");
 			deleteSFBySfid(Adapter,uiSearchRuleIndex);
 		}
 		else
@@ -2344,7 +2650,9 @@ VOID OverrideServiceFlowParams(PMINI_ADAPTER Adapter,PUINT puiBuffer)
 			Adapter->PackInfo[uiSearchRuleIndex].usCID = ntohs(pHostInfo->newCID);
 			Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE;
 
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,"pHostInfo->QoSParamSet: 0x%x\n",pHostInfo->QoSParamSet);
+			bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL,
+				"pHostInfo->QoSParamSet: 0x%x\n",
+				pHostInfo->QoSParamSet);
 
 			if(pHostInfo->QoSParamSet & 0x1)
 				Adapter->PackInfo[uiSearchRuleIndex].bAuthorizedSet =TRUE;
diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index 05c89d0..d9f1901 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -830,17 +830,17 @@ int ddr_init(MINI_ADAPTER *Adapter)
 		{
 				retval= rdmalt(Adapter,(UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
 				if(retval < 0) {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-							"%s:%d RDM failed\n",
-							__func__, __LINE__);
+					bcm_dbg(Adapter, CMHOST, RDM, ALL,
+						"%s:%d RDM failed\n",
+						__func__, __LINE__);
 					return retval;
 				}
 				uiResetValue |= 0x44;
 				retval = wrmalt(Adapter,(UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue));
 				if(retval < 0) {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, WRM, DBG_LVL_ALL,
-							"%s:%d WRM failed\n",
-							__func__, __LINE__);
+					bcm_dbg(Adapter, CMHOST, WRM, ALL,
+						"%s:%d WRM failed\n",
+						__func__, __LINE__);
 					return retval;
 				}
 		}
@@ -894,7 +894,8 @@ int ddr_init(MINI_ADAPTER *Adapter)
 	case 0xbece0121:
 	case 0xbece0130:
 	case 0xbece0300:
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "DDR Setting: %x\n", Adapter->DDRSetting);
+		bcm_dbg(Adapter, INITEXIT, DRV_ENTRY, ALL,
+			"DDR Setting: %x\n", Adapter->DDRSetting);
 	    switch (Adapter->DDRSetting)
 	    {
 	        case DDR_80_MHZ:
@@ -965,7 +966,8 @@ int ddr_init(MINI_ADAPTER *Adapter)
 	}
 
 	value=0;
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Register Count is =%lu\n", RegCount);
+	bcm_dbg(Adapter, INITEXIT, DRV_ENTRY, ALL,
+		"Register Count is =%lu\n", RegCount);
 	while(RegCount && !retval)
 	{
 		if(uiClockSetting && psDDRSetting->ulRegAddress == MIPS_CLOCK_REG)
@@ -998,32 +1000,33 @@ int ddr_init(MINI_ADAPTER *Adapter)
 			uiResetValue = 0x01010001;
 			retval = wrmalt(Adapter, (UINT)0x0F007018, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			uiResetValue = 0x00040020;
 			retval = wrmalt(Adapter, (UINT)0x0F007094, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			uiResetValue = 0x01020101;
 			retval = wrmalt(Adapter, (UINT)0x0F00701c, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			uiResetValue = 0x01010000;
 			retval = wrmalt(Adapter, (UINT)0x0F007018, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 		}
@@ -1039,24 +1042,24 @@ int ddr_init(MINI_ADAPTER *Adapter)
 		{
 			retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			uiResetValue = 0x1322a8;
 			retval = wrmalt(Adapter, (UINT)0x0f000d1c, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
@@ -1067,17 +1070,17 @@ int ddr_init(MINI_ADAPTER *Adapter)
 			}
 			retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			uiResetValue = 0x132296;
 			retval = wrmalt(Adapter, (UINT)0x0f000d14, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 		}
@@ -1086,46 +1089,46 @@ int ddr_init(MINI_ADAPTER *Adapter)
 
 			retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			uiResetValue = 0x6003229a;
 			retval = wrmalt(Adapter, (UINT)0x0f000d14, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 			uiResetValue = 0x1322a8;
 			retval = wrmalt(Adapter, (UINT)0x0f000d1c, &uiResetValue, sizeof(uiResetValue));
 			if(retval < 0) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_CMHOST, RDM, DBG_LVL_ALL,
-						"%s:%d RDM failed\n",
-						__func__, __LINE__);
+				bcm_dbg(Adapter, CMHOST, RDM, ALL,
+					"%s:%d RDM failed\n",
+					__func__, __LINE__);
 				return retval;
 			}
 		}
diff --git a/drivers/staging/bcm/Debug.h b/drivers/staging/bcm/Debug.h
index b0e8f17..7ce897f 100644
--- a/drivers/staging/bcm/Debug.h
+++ b/drivers/staging/bcm/Debug.h
@@ -216,19 +216,15 @@ typedef struct _S_BCM_DEBUG_STATE {
 //--- Only for direct printk's; "hidden" to API.
 #define DBG_TYPE_PRINTK		3
 
-#define BCM_DEBUG_PRINT(Adapter, Type, SubType, dbg_level, fmt, ...)	\
+#define bcm_dbg(Adapter, Type, SubType, dbg_level, fmt, ...)		\
 do {									\
-	if (Adapter &&							\
-	    ((dbg_level & DBG_LVL_BITMASK) <=				\
-	     Adapter->stDebugState.debug_level) &&			\
-	    (Type & Adapter->stDebugState.type) &&			\
-	    (SubType & Adapter->stDebugState.subtype[Type])) {		\
-		if (dbg_level & DBG_NO_FUNC_PRINT)			\
-			printk(KERN_DEBUG fmt, ##__VA_ARGS__);		\
-		else							\
-			printk(KERN_DEBUG "%s:" fmt,			\
-			       __func__, ##__VA_ARGS__);		\
-	}								\
+	if ((Adapter) &&						\
+	    ((DBG_LVL_##dbg_level & DBG_LVL_BITMASK) <=			\
+	     (Adapter)->stDebugState.debug_level) &&			\
+	    (DBG_TYPE_##Type & (Adapter)->stDebugState.type) &&		\
+	    (SubType &							\
+	     (Adapter)->stDebugState.subtype[DBG_TYPE_##Type]))		\
+		printk(KERN_DEBUG fmt, ##__VA_ARGS__);			\
 } while (0)
 
 #define BCM_DEBUG_PRINT_BUFFER(Adapter, Type, SubType, dbg_level,  buffer, bufferlen) do { \
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index b058e30..1a680f0 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -26,9 +26,8 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 
 	switch (usStatus) {
 	case CM_RESPONSES:               /* 0xA0 */
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
-			DBG_LVL_ALL,
-			"MAC Version Seems to be Non Multi-Classifier, rejected by Driver");
+		bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
+			"MAC Version Seems to be Non Multi-Classifier, rejected by Driver\n");
 		HighPriorityMessage = TRUE;
 		break;
 	case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:
@@ -39,8 +38,8 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 		break;
 	case LINK_CONTROL_RESP:          /* 0xA2 */
 	case STATUS_RSP:                 /* 0xA1 */
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
-			DBG_LVL_ALL, "LINK_CONTROL_RESP");
+		bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
+			"LINK_CONTROL_RESP\n");
 		HighPriorityMessage = TRUE;
 		LinkControlResponseMessage(Adapter,
 			(skb->data + sizeof(USHORT)));
@@ -50,9 +49,8 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 		StatisticsResponse(Adapter, (skb->data + sizeof(USHORT)));
 		break;
 	case IDLE_MODE_STATUS:           /* 0xA3 */
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
-			DBG_LVL_ALL,
-			"IDLE_MODE_STATUS Type Message Got from F/W");
+		bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
+			"IDLE_MODE_STATUS Type Message Got from F/W\n");
 		InterfaceIdleModeRespond(Adapter, (PUINT)(skb->data +
 					sizeof(USHORT)));
 		HighPriorityMessage = TRUE;
@@ -63,8 +61,8 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 		break;
 
 	default:
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
-			DBG_LVL_ALL, "Got Default Response");
+		bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
+			"Got Default Response\n");
 		/* Let the Application Deal with This Packet */
 		break;
 	}
@@ -146,8 +144,8 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 	up(&Adapter->RxAppControlQueuelock);
 	wake_up(&Adapter->process_read_wait_queue);
 	dev_kfree_skb(skb);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,
-			"After wake_up_interruptible");
+	bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
+		"After wake_up_interruptible\n");
 }
 
 /**
@@ -160,8 +158,8 @@ int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/)
 	unsigned long flags = 0;
 	/* struct timeval tv; */
 	/* int *puiBuffer = NULL; */
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,
-		"Entering to make thread wait on control packet event!");
+	bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
+		"Entering to make thread wait on control packet event!\n");
 	while (1) {
 		wait_event_interruptible(Adapter->process_rx_cntrlpkt,
 			atomic_read(&Adapter->cntrlpktCnt) ||
@@ -170,8 +168,8 @@ int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/)
 
 
 		if (kthread_should_stop()) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
-				DBG_LVL_ALL, "Exiting\n");
+			bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
+				"Exiting\n");
 			return 0;
 		}
 		if (TRUE == Adapter->bWakeUpDevice) {
@@ -179,8 +177,7 @@ int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/)
 			if ((FALSE == Adapter->bTriedToWakeUpFromlowPowerMode)
 					&& ((TRUE == Adapter->IdleMode) ||
 					    (TRUE == Adapter->bShutStatus))) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
-					CP_CTRL_PKT, DBG_LVL_ALL,
+				bcm_dbg(Adapter, OTHERS, CP_CTRL_PKT, ALL,
 					"Calling InterfaceAbortIdlemode\n");
 				/*
 				 * Adapter->bTriedToWakeUpFromlowPowerMode
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index 5b4fd37..3aff6e7 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -37,7 +37,8 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader
 	case IPV6HDR_TYPE_HOPBYHOP:
 		{
 
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 HopByHop Header");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 HopByHop Header\n");
 			usNextHeaderOffset+=sizeof(IPV6HopByHopOptionsHeader);
 		}
 		break;
@@ -45,7 +46,8 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader
 	case IPV6HDR_TYPE_ROUTING:
 		{
 			IPV6RoutingHeader *pstIpv6RoutingHeader;
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Routing Header");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 Routing Header\n");
 			pstIpv6RoutingHeader = (IPV6RoutingHeader *)pucPayloadPtr;
 			usNextHeaderOffset += sizeof(IPV6RoutingHeader);
 			usNextHeaderOffset += pstIpv6RoutingHeader->ucNumAddresses * IPV6_ADDRESS_SIZEINBYTES;
@@ -54,7 +56,8 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader
 		break;
 	case IPV6HDR_TYPE_FRAGMENTATION:
 		{
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Fragmentation Header");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 Fragmentation Header\n");
 			usNextHeaderOffset+= sizeof(IPV6FragmentHeader);
 
 		}
@@ -63,7 +66,8 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader
 		{
 			IPV6DestOptionsHeader *pstIpv6DestOptsHdr = (IPV6DestOptionsHeader *)pucPayloadPtr;
 			int nTotalOptions = pstIpv6DestOptsHdr->ucHdrExtLen;
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 DestOpts Header Header");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 DestOpts Header Header\n");
 			usNextHeaderOffset+= sizeof(IPV6DestOptionsHeader);
 			usNextHeaderOffset+= nTotalOptions * IPV6_DESTOPTS_HDR_OPTIONSIZE ;
 
@@ -73,32 +77,34 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload,UCHAR *pucNextHeader
 		{
 			IPV6AuthenticationHeader *pstIpv6AuthHdr = (IPV6AuthenticationHeader *)pucPayloadPtr;
 			int nHdrLen = pstIpv6AuthHdr->ucLength;
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Authentication Header");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 Authentication Header\n");
 			usNextHeaderOffset+= nHdrLen * 4;
 		}
 		break;
 	case IPV6HDR_TYPE_ENCRYPTEDSECURITYPAYLOAD:
 		{
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Encrypted Security Payload Header");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 Encrypted Security Payload Header\n");
 			*bParseDone = TRUE;
 
 		}
 		break;
 	case IPV6_ICMP_HDR_TYPE:
 		{
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, " ICMP Header");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "ICMP Header\n");
 			*bParseDone = TRUE;
 		}
 		break;
 	case TCP_HEADER_TYPE:
 		{
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, " \nTCP Header");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "TCP Header\n");
 			*bParseDone = TRUE;
 		}
 		break;
 	case UDP_HEADER_TYPE:
 		{
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, " \nUDP Header");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "UDP Header\n");
 			*bParseDone = TRUE;
 		}
 		break;
@@ -158,7 +164,10 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload,USHORT *pusSrcPort,USHORT *p
 			{
 				 *pusSrcPort=*((PUSHORT)(pucNextHeader));
 				 *pusDestPort=*((PUSHORT)(pucNextHeader+2));
-				 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, " \nProtocol Ports - Src Port :0x%x Dest Port : 0x%x",ntohs(*pusSrcPort),ntohs(*pusDestPort));
+				 bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+					 "Protocol Ports - Src Port :0x%x Dest Port : 0x%x\n",
+					 ntohs(*pusSrcPort),
+					 ntohs(*pusDestPort));
 			}
 			break;
 
@@ -179,7 +188,7 @@ USHORT	IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru
 	IPV6Header *pstIpv6Header = NULL;
 	BOOLEAN bClassificationSucceed = FALSE;
 
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "IpVersion6 ==========>\n");
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "IpVersion6 ==========>\n");
 
 	pstIpv6Header = (IPV6Header *)pcIpHeader;
 
@@ -219,24 +228,29 @@ USHORT	IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru
 		bClassificationSucceed=MatchProtocol(pstClassifierRule,ucNextProtocolAboveIP);
         if(!bClassificationSucceed)
             break;
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Protocol Matched");
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "IPv6 Protocol Matched\n");
 
 		if((ucNextProtocolAboveIP == TCP_HEADER_TYPE) || (ucNextProtocolAboveIP == UDP_HEADER_TYPE))
 		{
 			//Match Src Port
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Source Port:%x\n",ntohs(ushSrcPort));
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 Source Port:%x\n", ntohs(ushSrcPort));
 			bClassificationSucceed=MatchSrcPort(pstClassifierRule,ntohs(ushSrcPort));
 			if(!bClassificationSucceed)
 				break;
 
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Src Port Matched");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 Src Port Matched\n");
 
 			//Match Dest Port
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Destination Port:%x\n",ntohs(ushDestPort));
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 Destination Port:%x\n",
+				ntohs(ushDestPort));
 			bClassificationSucceed=MatchDestPort(pstClassifierRule,ntohs(ushDestPort));
 			if(!bClassificationSucceed)
 				break;
-			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Dest Port Matched");
+			bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+				"IPv6 Dest Port Matched\n");
 		}
 	}while(0);
 
@@ -287,11 +301,14 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head
 
 	for(uiLoopIndex=0;uiLoopIndex<uiCountIPSrcAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords)
 	{
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Address In Received Packet : \n ");
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"Src Ipv6 Address In Received Packet :\n");
 		DumpIpv6Address(aulSrcIP);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Mask In Classifier Rule: \n");
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"Src Ipv6 Mask In Classifier Rule:\n");
 		DumpIpv6Address(&pstClassifierRule->stSrcIpAddress.ulIpv6Mask[uiLoopIndex]);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Address In Classifier Rule : \n");
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"Src Ipv6 Address In Classifier Rule :\n");
 		DumpIpv6Address(&pstClassifierRule->stSrcIpAddress.ulIpv6Addr[uiLoopIndex]);
 
 		for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)
@@ -306,7 +323,8 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head
 			if(uiIpv6AddIndex ==  uiIpv6AddrNoLongWords-1)
 			{
 				//Match Found
-				BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Ipv6 Src Ip Address Matched\n");
+				bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+					"Ipv6 Src Ip Address Matched\n");
 				return TRUE;
 			}
 		}
@@ -340,11 +358,14 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea
 
 	for(uiLoopIndex=0;uiLoopIndex<uiCountIPDestinationAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords)
 	{
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Address In Received Packet : \n ");
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"Destination Ipv6 Address In Received Packet :\n");
 		DumpIpv6Address(aulDestIP);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Mask In Classifier Rule: \n");
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"Destination Ipv6 Mask In Classifier Rule:\n");
 		DumpIpv6Address(&pstClassifierRule->stDestIpAddress.ulIpv6Mask[uiLoopIndex]);
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Address In Classifier Rule : \n");
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+			"Destination Ipv6 Address In Classifier Rule :\n");
 		DumpIpv6Address(&pstClassifierRule->stDestIpAddress.ulIpv6Addr[uiLoopIndex]);
 
 		for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)
@@ -359,7 +380,8 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea
 			if(uiIpv6AddIndex ==  uiIpv6AddrNoLongWords-1)
 			{
 				//Match Found
-				BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Ipv6 Destination Ip Address Matched\n");
+				bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+					"Ipv6 Destination Ip Address Matched\n");
 				return TRUE;
 			}
 		}
@@ -375,7 +397,8 @@ VOID DumpIpv6Address(ULONG *puIpv6Address)
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	for(uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++)
 	{
-		BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, ":%lx",puIpv6Address[uiIpv6AddIndex]);
+		bcm_dbg(Adapter, TX, IPV6_DBG, ALL, ":%lx\n",
+			puIpv6Address[uiIpv6AddIndex]);
 	}
 
 }
@@ -385,20 +408,23 @@ static VOID DumpIpv6Header(IPV6Header *pstIpv6Header)
 	UCHAR ucVersion;
 	UCHAR  ucPrio ;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "----Ipv6 Header---");
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "----Ipv6 Header---\n");
 	ucVersion = pstIpv6Header->ucVersionPrio & 0xf0;
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Version : %x \n",ucVersion);
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "Version : %x\n", ucVersion);
 	ucPrio = pstIpv6Header->ucVersionPrio & 0x0f;
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Priority : %x \n",ucPrio);
-	//BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Flow Label : %x \n",(pstIpv6Header->ucVersionPrio &0xf0);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Payload Length : %x \n",ntohs(pstIpv6Header->usPayloadLength));
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Next Header : %x \n",pstIpv6Header->ucNextHeader);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Hop Limit : %x \n",pstIpv6Header->ucHopLimit);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Src Address :\n");
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "Priority : %x\n", ucPrio);
+	//bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "Flow Label : %x\n",(pstIpv6Header->ucVersionPrio &0xf0);
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+		"Payload Length : %x\n", ntohs(pstIpv6Header->usPayloadLength));
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+		"Next Header : %x\n", pstIpv6Header->ucNextHeader);
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL,
+		"Hop Limit : %x\n", pstIpv6Header->ucHopLimit);
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "Src Address :\n");
 	DumpIpv6Address(pstIpv6Header->ulSrcIpAddress);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "Dest Address :\n");
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "Dest Address :\n");
 	DumpIpv6Address(pstIpv6Header->ulDestIpAddress);
-	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "----Ipv6 Header End---");
+	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "----Ipv6 Header End---\n");
 
 
 }
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index 3bc2adb..20b7fc8 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -23,16 +23,15 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc)
 		set_fs(oldfs);
 		if (len <= 0) {
 			if (len < 0) {
-				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,
-						DBG_TYPE_INITEXIT, MP_INIT,
-						DBG_LVL_ALL, "len < 0");
+				bcm_dbg(psIntfAdapter->psAdapter,
+					INITEXIT, MP_INIT, ALL,
+					"len < 0\n");
 				errno = len;
 			} else {
 				errno = 0;
-				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,
-						DBG_TYPE_INITEXIT, MP_INIT,
-						DBG_LVL_ALL,
-						"Got end of file!");
+				bcm_dbg(psIntfAdapter->psAdapter,
+					INITEXIT, MP_INIT, ALL,
+					"Got end of file!\n");
 			}
 			break;
 		}
@@ -86,11 +85,15 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c
 
 		if (len <= 0) {
 			if (len < 0) {
-				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "len < 0");
+				bcm_dbg(psIntfAdapter->psAdapter,
+					INITEXIT, MP_INIT, ALL,
+					"len < 0\n");
 				errno = len;
 			} else {
 				errno = 0;
-				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Got end of file!");
+				bcm_dbg(psIntfAdapter->psAdapter,
+					INITEXIT, MP_INIT, ALL,
+					"Got end of file!\n");
 			}
 			break;
 		}
@@ -98,14 +101,21 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c
 		bytes = InterfaceRDM(psIntfAdapter, on_chip_loc, buff_readback, len);
 		if (bytes < 0) {
 			Status = bytes;
-			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "RDM of len %d Failed! %d", len, reg);
+			bcm_dbg(psIntfAdapter->psAdapter,
+				INITEXIT, MP_INIT, ALL,
+				"RDM of len %d Failed! %d\n", len, reg);
 			goto exit;
 		}
 		reg++;
 		if ((len-sizeof(unsigned int)) < 4) {
 			if (memcmp(buff_readback, buff, len)) {
-				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Firmware Download is not proper %d", fw_down);
-				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Length is: %d", len);
+				bcm_dbg(psIntfAdapter->psAdapter,
+					INITEXIT, MP_INIT, ALL,
+					"Firmware Download is not proper %d\n",
+					fw_down);
+				bcm_dbg(psIntfAdapter->psAdapter,
+					INITEXIT, MP_INIT, ALL,
+					"Length is: %d\n", len);
 				Status = -EIO;
 				goto exit;
 			}
@@ -114,9 +124,18 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c
 
 			while (len) {
 				if (*(unsigned int *)&buff_readback[len] != *(unsigned int *)&buff[len]) {
-					BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Firmware Download is not proper %d", fw_down);
-					BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Val from Binary %x, Val From Read Back %x ", *(unsigned int *)&buff[len], *(unsigned int*)&buff_readback[len]);
-					BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "len =%x!!!", len);
+					bcm_dbg(psIntfAdapter->psAdapter,
+						INITEXIT, MP_INIT, ALL,
+						"Firmware Download is not proper %d\n",
+						fw_down);
+					bcm_dbg(psIntfAdapter->psAdapter,
+						INITEXIT, MP_INIT, ALL,
+						"Val from Binary %x, Val From Read Back %x\n",
+						*(unsigned int *)&buff[len],
+						*(unsigned int*)&buff_readback[len]);
+					bcm_dbg(psIntfAdapter->psAdapter,
+						INITEXIT, MP_INIT, ALL,
+						"len =%x!!!\n", len);
 					Status = -EIO;
 					goto exit;
 				}
@@ -161,7 +180,7 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwIn
 	retval = InitLedSettings(Adapter);
 
 	if (retval) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "INIT LED Failed\n");
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL, "INIT LED Failed\n");
 		return retval;
 	}
 
@@ -179,7 +198,7 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwIn
 	/* Initialize the DDR Controller */
 	retval = ddr_init(Adapter);
 	if (retval) {
-		BCM_DEBUG_PRINT (Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "DDR Init Failed\n");
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL, "DDR Init Failed\n");
 		return retval;
 	}
 
@@ -190,7 +209,9 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwIn
 	if (Adapter->eNVMType == NVM_FLASH) {
 		retval = PropagateCalParamsFromFlashToMemory(Adapter);
 		if (retval) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "propagaion of cal param failed with status :%d", retval);
+			bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+				"propagaion of cal param failed with status :%d\n",
+				retval);
 			return retval;
 		}
 	}
@@ -198,7 +219,8 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwIn
 	retval = buffDnldVerify(Adapter, (PUCHAR)Adapter->pstargetparams, sizeof(STARGETPARAMS), CONFIG_BEGIN_ADDR);
 
 	if (retval)
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "configuration file not downloaded properly");
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"configuration file not downloaded properly\n");
 	else
 		Adapter->bCfgDownloaded = TRUE;
 
@@ -217,9 +239,14 @@ static int bcm_compare_buff_contents(unsigned char *readbackbuff, unsigned char
 
 		while (len) {
 			if (*(unsigned int *)&readbackbuff[len] != *(unsigned int *)&buff[len]) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Firmware Download is not proper");
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Val from Binary %x, Val From Read Back %x ", *(unsigned int *)&buff[len], *(unsigned int*)&readbackbuff[len]);
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "len =%x!!!", len);
+				bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+					"Firmware Download is not proper\n");
+				bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+					"Val from Binary %x, Val From Read Back %x\n",
+					*(unsigned int *)&buff[len],
+					*(unsigned int *)&readbackbuff[len]);
+				bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+					"len =%x!!!\n", len);
 				retval = -EINVAL;
 				break;
 			}
@@ -241,7 +268,8 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
 	atomic_set(&Adapter->uiMBupdate, FALSE);
 	if (!Adapter->bCfgDownloaded && psFwInfo->u32StartingAddress != CONFIG_BEGIN_ADDR) {
 		/* Can't Download Firmware. */
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Download the config File first\n");
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"Download the config File first\n");
 		return -EINVAL;
 	}
 
@@ -251,13 +279,15 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
 	} else {
 		buff = kzalloc(psFwInfo->u32FirmwareLength, GFP_KERNEL);
 		if (buff == NULL) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Failed in allocation memory");
+			bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+				"Failed in allocation memory\n");
 			return -ENOMEM;
 		}
 
 		retval = copy_from_user(buff, psFwInfo->pvMappedFirmwareAddress, psFwInfo->u32FirmwareLength);
 		if (retval != STATUS_SUCCESS) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "copying buffer from user space failed");
+			bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+				"copying buffer from user space failed\n");
 			retval = -EFAULT;
 			goto error;
 		}
@@ -268,7 +298,8 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
 					psFwInfo->u32StartingAddress);
 
 		if (retval != STATUS_SUCCESS) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "f/w download failed status :%d", retval);
+			bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+				"f/w download failed status :%d\n", retval);
 			goto error;
 		}
 	}
@@ -289,7 +320,8 @@ static INT buffDnld(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Firmware
 		retval = wrm(Adapter, u32StartingAddress, mappedbuffer, len);
 
 		if (retval) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "wrm failed with status :%d", retval);
+			bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+				"wrm failed with status :%d\n", retval);
 			break;
 		}
 		u32StartingAddress += len;
@@ -307,7 +339,8 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Fi
 	int bytes;
 
 	if (NULL == readbackbuff) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "MEMORY ALLOCATION FAILED");
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"MEMORY ALLOCATION FAILED\n");
 		return -ENOMEM;
 	}
 
@@ -317,7 +350,8 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Fi
 
 		if (bytes < 0) {
 			retval = bytes;
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "rdm failed with status %d", retval);
+			bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+				"rdm failed with status %d\n", retval);
 			break;
 		}
 
@@ -340,13 +374,15 @@ INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned
 
 	status = buffDnld(Adapter, mappedbuffer, u32FirmwareLength, u32StartingAddress);
 	if (status != STATUS_SUCCESS) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Buffer download failed");
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"Buffer download failed\n");
 		goto error;
 	}
 
 	status = buffRdbkVerify(Adapter, mappedbuffer, u32FirmwareLength, u32StartingAddress);
 	if (status != STATUS_SUCCESS) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Buffer readback verifier failed");
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"Buffer readback verifier failed\n");
 		goto error;
 	}
 error:
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index f4c415f..b5c44f0 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -50,14 +50,17 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
 	unsigned int	uiRegRead = 0;
 	int bytes;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"SubType of Message :0x%X", ntohl(*puiBuffer));
+	bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+		"SubType of Message :0x%X\n", ntohl(*puiBuffer));
 
 	if(ntohl(*puiBuffer) == GO_TO_IDLE_MODE_PAYLOAD)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL," Got GO_TO_IDLE_MODE_PAYLOAD(210) Msg Subtype");
+		bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+			"Got GO_TO_IDLE_MODE_PAYLOAD(210) Msg Subtype\n");
 		if(ntohl(*(puiBuffer+1)) == 0 )
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"Got IDLE MODE WAKE UP Response From F/W");
+			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+				"Got IDLE MODE WAKE UP Response From F/W\n");
 
 			status = wrmalt (Adapter,SW_ABORT_IDLEMODE_LOC, &uiRegRead, sizeof(uiRegRead));
 			if(status)
@@ -94,7 +97,8 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
 					return status;
 				}
 			}
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "Device Up from Idle Mode");
+			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+				"Device Up from Idle Mode\n");
 
 			// Set Idle Mode Flag to False and Clear IdleMode reg.
 			Adapter->IdleMode = FALSE;
@@ -107,12 +111,14 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
 		{
 			if(TRUE == Adapter->IdleMode)
 			{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"Device is already in Idle mode....");
+				bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+					"Device is already in Idle mode....\n");
 				return status ;
 			}
 
 			uiRegRead = 0;
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "Got Req from F/W to go in IDLE mode \n");
+			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+				"Got Req from F/W to go in IDLE mode\n");
 
 			if (Adapter->chip_id== BCS220_2 ||
 				Adapter->chip_id == BCS220_2BC ||
@@ -123,7 +129,8 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
 				bytes = rdmalt(Adapter, HPM_CONFIG_MSW, &uiRegRead, sizeof(uiRegRead));
 				if (bytes < 0) {
 					status = bytes;
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "rdm failed while Reading HPM_CONFIG_LDO145 Reg 0\n");
+					bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+						"rdm failed while Reading HPM_CONFIG_LDO145 Reg 0\n");
 					return status;
 				}
 
@@ -143,7 +150,8 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
 	}
 	else if(ntohl(*puiBuffer) == IDLE_MODE_SF_UPDATE_MSG)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "OverRiding Service Flow Params");
+		bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+			"OverRiding Service Flow Params\n");
 		OverrideServiceFlowParams(Adapter,puiBuffer);
 	}
 	return status;
@@ -164,7 +172,9 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 	if((TRUE == psInterfaceAdapter->bSuspended) && (TRUE == Adapter->bDoSuspend))
 	{
 		status = usb_autopm_get_interface(psInterfaceAdapter->interface);
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"Bus got wakeup..Aborting Idle mode... status:%d \n",status);
+		bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+			"Bus got wakeup..Aborting Idle mode... status:%d\n",
+			status);
 
 	}
 
@@ -173,11 +183,14 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 	   (Adapter->ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE))
 	{
 		//write the SW abort pattern.
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "Writing pattern<%d> to SW_ABORT_IDLEMODE_LOC\n", Pattern);
+		bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+			"Writing pattern<%d> to SW_ABORT_IDLEMODE_LOC\n",
+			Pattern);
 		status = wrmalt(Adapter,SW_ABORT_IDLEMODE_LOC, &Pattern, sizeof(Pattern));
 		if(status)
 		{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"WRM to Register SW_ABORT_IDLEMODE_LOC failed..");
+			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+				"WRM to Register SW_ABORT_IDLEMODE_LOC failed..\n");
 				return status;
 		}
 	}
@@ -188,7 +201,8 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 		status = wrmalt(Adapter,DEBUG_INTERRUPT_GENERATOR_REGISTOR, &value, sizeof(value));
 		if(status)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"WRM to DEBUG_INTERRUPT_GENERATOR_REGISTOR Register failed");
+			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+				"WRM to DEBUG_INTERRUPT_GENERATOR_REGISTOR Register failed\n");
 			return status;
 		}
 	}
@@ -208,12 +222,15 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 			5000);
 		if(status)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "Sending Abort pattern down fails with status:%d..\n",status);
+			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+				"Sending Abort pattern down fails with status:%d..\n",
+				status);
 			return status;
 		}
 		else
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "NOB Sent down :%d", lenwritten);
+			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+				"NOB Sent down :%d\n", lenwritten);
 		}
 
 		//mdelay(25);
@@ -232,11 +249,14 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 		}
 		if(timeout < jiffies )
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"Not able to read chip-id even after 25 msec");
+			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+				"Not able to read chip-id even after 25 msec\n");
 		}
 		else
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"Number of completed iteration to read chip-id :%lu", itr);
+			bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+				"Number of completed iteration to read chip-id :%lu\n",
+				itr);
 		}
 
 		status = wrmalt(Adapter,SW_ABORT_IDLEMODE_LOC, &Pattern, sizeof(status));
@@ -253,11 +273,13 @@ int InterfaceIdleModeWakeup(PMINI_ADAPTER Adapter)
 	ULONG	Status = 0;
 	if(Adapter->bTriedToWakeUpFromlowPowerMode)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "Wake up already attempted.. ignoring\n");
+		bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+			"Wake up already attempted.. ignoring\n");
 	}
 	else
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"Writing Low Power Mode Abort pattern to the Device\n");
+		bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL,
+			"Writing Low Power Mode Abort pattern to the Device\n");
 		Adapter->bTriedToWakeUpFromlowPowerMode = TRUE;
 		InterfaceAbortIdlemode(Adapter, Adapter->usIdleModePattern);
 
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index d3eeedf..56a66a7c 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -41,7 +41,7 @@ static void InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
 	 * to accertain the device is not being accessed. After this No RDM/WRM should be made.
 	 */
 	while (psIntfAdapter->psAdapter->DeviceAccess) {
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+		bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 			"Device is being accessed.\n");
 		msleep(100);
 	}
@@ -98,7 +98,7 @@ static void ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)
 	/* Program TX EP as interrupt(Alternate Setting) */
 	bytes = rdmalt(Adapter, 0x0F0110F8, (u32 *)&ulReg, sizeof(u32));
 	if (bytes < 0) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+		bcm_dbg(Adapter, INITEXIT, DRV_ENTRY, ALL,
 			"reading of Tx EP failed\n");
 		return;
 	}
@@ -204,7 +204,7 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi
 	psIntfAdapter->interface = intf;
 	usb_set_intfdata(intf, psIntfAdapter);
 
-	BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+	bcm_dbg(psAdapter, INITEXIT, DRV_ENTRY, ALL,
 		"psIntfAdapter 0x%p\n", psIntfAdapter);
 	retval = InterfaceAdapterInit(psIntfAdapter);
 	if (retval) {
@@ -213,11 +213,11 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi
 		 * download the files.
 		 */
 		if (-ENOENT == retval) {
-			BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+			bcm_dbg(psAdapter, INITEXIT, DRV_ENTRY, ALL,
 				"File Not Found.  Use app to download.\n");
 			return STATUS_SUCCESS;
 		}
-		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+		bcm_dbg(psAdapter, INITEXIT, DRV_ENTRY, ALL,
 			"InterfaceAdapterInit failed.\n");
 		usb_set_intfdata(intf, NULL);
 		udev = interface_to_usbdev(intf);
@@ -243,7 +243,7 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi
 			usb_enable_autosuspend(udev);
 			device_init_wakeup(&intf->dev, 1);
 			INIT_WORK(&psIntfAdapter->usbSuspendWork, putUsbSuspend);
-			BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+			bcm_dbg(psAdapter, INITEXIT, DRV_ENTRY, ALL,
 				"Enabling USB Auto-Suspend\n");
 #endif
 		} else {
@@ -321,8 +321,8 @@ static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter)
 	}
 	if (TRUE == psIntfAdapter->psAdapter->fw_download_done) {
 		if (StartInterruptUrb(psIntfAdapter)) {
-			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
-			"Cannot send interrupt in URB\n");
+			bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
+				"Cannot send interrupt in URB\n");
 		}
 
 		/*
@@ -467,20 +467,20 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 			/* selecting alternate setting one as a default setting for High Speed  modem. */
 			if (psIntfAdapter->bHighSpeedDevice)
 				retval = usb_set_interface(psIntfAdapter->udev, DEFAULT_SETTING_0, ALTERNATE_SETTING_1);
-			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+			bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 				"BCM16 is applicable on this dongle\n");
 			if (retval || (psIntfAdapter->bHighSpeedDevice == FALSE)) {
 				usedIntOutForBulkTransfer = EP2 ;
 				endpoint = &iface_desc->endpoint[EP2].desc;
-				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
-					 "Interface altsetting failed or modem is configured to Full Speed, hence will work on default setting 0\n");
+				bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
+					"Interface altsetting failed or modem is configured to Full Speed, hence will work on default setting 0\n");
 				/*
 				 * If Modem is high speed device EP2 should be INT OUT End point
 				 * If Mode is FS then EP2 should be bulk end point
 				 */
 				if (((psIntfAdapter->bHighSpeedDevice == TRUE) && (bcm_usb_endpoint_is_int_out(endpoint) == FALSE))
 					|| ((psIntfAdapter->bHighSpeedDevice == FALSE) && (bcm_usb_endpoint_is_bulk_out(endpoint) == FALSE))) {
-					BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+					bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 						"Configuring the EEPROM\n");
 					/* change the EP2, EP4 to INT OUT end point */
 					ConfigureEndPointTypesThroughEEPROM(psIntfAdapter->psAdapter);
@@ -492,7 +492,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 					 */
 					retval = usb_reset_device(psIntfAdapter->udev);
 					if (retval) {
-						BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+						bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 							"reset failed.  Re-enumerating the device.\n");
 						return retval ;
 					}
@@ -501,17 +501,17 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 				if ((psIntfAdapter->bHighSpeedDevice == FALSE) && bcm_usb_endpoint_is_bulk_out(endpoint)) {
 					/* Once BULK is selected in FS mode. Revert it back to INT. Else USB_IF will fail. */
 					UINT _uiData = ntohl(EP2_CFG_INT);
-					BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+					bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 						"Reverting Bulk to INT as it is in Full Speed mode.\n");
 					BeceemEEPROMBulkWrite(psIntfAdapter->psAdapter, (PUCHAR)&_uiData, 0x136, 4, TRUE);
 				}
 			} else {
 				usedIntOutForBulkTransfer = EP4 ;
 				endpoint = &iface_desc->endpoint[EP4].desc;
-				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+				bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 					"Choosing AltSetting as a default setting.\n");
 				if (bcm_usb_endpoint_is_int_out(endpoint) == FALSE) {
-					BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+					bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 						"Dongle does not have BCM16 Fix.\n");
 					/* change the EP2, EP4 to INT OUT end point and use EP4 in altsetting */
 					ConfigureEndPointTypesThroughEEPROM(psIntfAdapter->psAdapter);
@@ -523,7 +523,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
 					 */
 					retval = usb_reset_device(psIntfAdapter->udev);
 					if (retval) {
-						BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+						bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 							"reset failed.  Re-enumerating the device.\n");
 						return retval;
 					}
@@ -625,11 +625,11 @@ static int InterfaceSuspend(struct usb_interface *intf, pm_message_t message)
 
 		if (psIntfAdapter->psAdapter->LinkStatus == LINKUP_DONE) {
 			psIntfAdapter->psAdapter->IdleMode = TRUE ;
-			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+			bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 				"Host Entered in PMU Idle Mode.\n");
 		} else {
 			psIntfAdapter->psAdapter->bShutStatus = TRUE;
-			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
+			bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL,
 				"Host Entered in PMU Shutdown Mode.\n");
 		}
 	}
diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c
index 67719d5..5545cbc 100644
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -13,7 +13,8 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 
 	if(Adapter->device_removed == TRUE)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Device has Got Removed.");
+		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			"Device has Got Removed.\n");
 		return ;
 	}
 
@@ -21,11 +22,13 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 		psIntfAdapter->bSuspended ||
 		psIntfAdapter->bPreparingForBusSuspend)
 	{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt call back is called while suspending the device");
+		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			"Interrupt call back is called while suspending the device\n");
 			return ;
 	}
 
-	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "interrupt urb status %d", status);
+	//bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+	//"interrupt urb status %d\n", status);
 	switch (status) {
 	    /* success */
 	    case STATUS_SUCCESS:
@@ -34,7 +37,8 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 
 			if(psIntfAdapter->ulInterruptData[1] & 0xFF)
 			{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL, "Got USIM interrupt");
+				bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+					"Got USIM interrupt\n");
 			}
 
 			if(psIntfAdapter->ulInterruptData[1] & 0xFF00)
@@ -42,14 +46,16 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 				atomic_set(&Adapter->CurrNumFreeTxDesc,
 					(psIntfAdapter->ulInterruptData[1] & 0xFF00) >> 8);
 				atomic_set (&Adapter->uiMBupdate, TRUE);
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL, "TX mailbox contains %d",
+				bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+					"TX mailbox contains %d\n",
 					atomic_read(&Adapter->CurrNumFreeTxDesc));
 			}
 			if(psIntfAdapter->ulInterruptData[1] >> 16)
 			{
 				Adapter->CurrNumRecvDescs=
 					(psIntfAdapter->ulInterruptData[1]  >> 16);
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"RX mailbox contains %d",
+				bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+					"RX mailbox contains %d\n",
 					Adapter->CurrNumRecvDescs);
 				InterfaceRx(psIntfAdapter);
 			}
@@ -70,24 +76,28 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 				atomic_set(&Adapter->TxPktAvail, 1);
 				wake_up(&Adapter->tx_packet_wait_queue);
 			}
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Firing interrupt in URB");
+			bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+				"Firing interrupt in URB\n");
 		}
 		break;
 		case -ENOENT :
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"URB has got disconnected ....");
+			bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+				"URB has got disconnected ....\n");
 			return ;
 		}
 		case -EINPROGRESS:
 		{
 			//This situation may happened when URBunlink is used. for detail check usb_unlink_urb documentation.
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Impossibe condition has occurred... something very bad is going on");
+			bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+				"Impossibe condition has occurred... something very bad is going on\n");
 			break ;
 			//return;
 		}
 		case -EPIPE:
 		{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt IN endPoint  has got halted/stalled...need to clear this");
+			bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+				"Interrupt IN endPoint  has got halted/stalled...need to clear this\n");
 				Adapter->bEndPointHalted = TRUE ;
 				wake_up(&Adapter->tx_packet_wait_queue);
 				urb->status = STATUS_SUCCESS ;
@@ -99,13 +109,16 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 	    						//Occurs only when something happens with the host controller device
 	    case -ENODEV : //Device got removed
 		case -EINVAL : //Some thing very bad happened with the URB. No description is available.
-	    	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"interrupt urb error %d", status);
+		    bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			    "interrupt urb error %d\n", status);
 			urb->status = STATUS_SUCCESS ;
 			break ;
 			//return;
 	    default:
 			//This is required to check what is the defaults conditions when it occurs..
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"GOT DEFAULT INTERRUPT URB STATUS :%d..Please Analyze it...", status);
+		    bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+			    "GOT DEFAULT INTERRUPT URB STATUS :%d..Please Analyze it...\n",
+			    status);
 		break;
 	}
 
@@ -119,7 +132,8 @@ int CreateInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter)
 	psIntfAdapter->psInterruptUrb = usb_alloc_urb(0, GFP_KERNEL);
 	if (!psIntfAdapter->psInterruptUrb)
 	{
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot allocate interrupt urb");
+		bcm_dbg(psIntfAdapter->psAdapter, OTHERS, INTF_INIT, ALL,
+			"Cannot allocate interrupt urb\n");
 		return -ENOMEM;
 	}
 	psIntfAdapter->psInterruptUrb->transfer_buffer =
@@ -137,8 +151,9 @@ int CreateInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter)
 					read_int_callback, psIntfAdapter,
 					psIntfAdapter->sIntrIn.int_in_interval);
 
-	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt Interval: %d\n",
-				psIntfAdapter->sIntrIn.int_in_interval);
+	bcm_dbg(psIntfAdapter->psAdapter, OTHERS, INTF_INIT, ALL,
+		"Interrupt Interval: %d\n",
+		psIntfAdapter->sIntrIn.int_in_interval);
 	return 0;
 }
 
@@ -156,7 +171,9 @@ INT StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter)
 		status = usb_submit_urb(psIntfAdapter->psInterruptUrb, GFP_ATOMIC);
 		if (status)
 		{
-			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot send int urb %d\n", status);
+			bcm_dbg(psIntfAdapter->psAdapter,
+				OTHERS, INTF_INIT, ALL,
+				"Cannot send int urb %d\n", status);
 			if(status == -EPIPE)
 			{
 				psIntfAdapter->psAdapter->bEndPointHalted = TRUE ;
diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index 8f96308..40d6c34 100644
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -21,12 +21,14 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
 	}
 
 	if ((psIntfAdapter->psAdapter->StopAllXaction == TRUE) && (psIntfAdapter->psAdapter->chip_id >= T3LPB))	{
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "Currently Xaction is not allowed on the bus");
+		bcm_dbg(psIntfAdapter->psAdapter, OTHERS, RDM, ALL,
+			"Currently Xaction is not allowed on the bus\n");
 		return -EACCES;
 	}
 
 	if (psIntfAdapter->bSuspended == TRUE || psIntfAdapter->bPreparingForBusSuspend == TRUE) {
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "Bus is in suspended states hence RDM not allowed..");
+		bcm_dbg(psIntfAdapter->psAdapter, OTHERS, RDM, ALL,
+			"Bus is in suspended states hence RDM not allowed..\n");
 		return -EACCES;
 	}
 	psIntfAdapter->psAdapter->DeviceAccess = TRUE;
@@ -51,9 +53,12 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
 	} while ((bytes < 0) && (usRetries < MAX_RDM_WRM_RETIRES));
 
 	if (bytes < 0)
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d, retires :%d", bytes, usRetries);
+		bcm_dbg(psIntfAdapter->psAdapter, OTHERS, RDM, ALL,
+			"RDM failed status :%d, retires :%d\n",
+			bytes, usRetries);
 	else
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM sent %d", bytes);
+		bcm_dbg(psIntfAdapter->psAdapter, OTHERS, RDM, ALL,
+			"RDM sent %d\n", bytes);
 
 	psIntfAdapter->psAdapter->DeviceAccess = FALSE;
 	return bytes;
@@ -78,12 +83,14 @@ INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
 	}
 
 	if ((psIntfAdapter->psAdapter->StopAllXaction == TRUE) && (psIntfAdapter->psAdapter->chip_id >= T3LPB)) {
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, WRM, DBG_LVL_ALL, "Currently Xaction is not allowed on the bus...");
+		bcm_dbg(psIntfAdapter->psAdapter, OTHERS, WRM, ALL,
+			"Currently Xaction is not allowed on the bus...\n");
 		return -EACCES;
 	}
 
 	if (psIntfAdapter->bSuspended == TRUE || psIntfAdapter->bPreparingForBusSuspend == TRUE) {
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, WRM, DBG_LVL_ALL, "Bus is in suspended states hence RDM not allowed..");
+		bcm_dbg(psIntfAdapter->psAdapter, OTHERS, WRM, ALL,
+			"Bus is in suspended states hence RDM not allowed..\n");
 		return -EACCES;
 	}
 
@@ -109,12 +116,15 @@ INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
 	} while ((retval < 0) && (usRetries < MAX_RDM_WRM_RETIRES));
 
 	if (retval < 0)	{
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, WRM, DBG_LVL_ALL, "WRM failed status :%d, retires :%d", retval, usRetries);
+		bcm_dbg(psIntfAdapter->psAdapter, OTHERS, WRM, ALL,
+			"WRM failed status :%d, retires :%d\n",
+			retval, usRetries);
 		psIntfAdapter->psAdapter->DeviceAccess = FALSE;
 		return retval;
 	} else {
 		psIntfAdapter->psAdapter->DeviceAccess = FALSE;
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, WRM, DBG_LVL_ALL, "WRM sent %d", retval);
+		bcm_dbg(psIntfAdapter->psAdapter, OTHERS, WRM, ALL,
+			"WRM sent %d\n", retval);
 		return STATUS_SUCCESS;
 	}
 }
@@ -161,15 +171,21 @@ INT Bcm_clear_halt_of_endpoints(PMINI_ADAPTER Adapter)
 	/* clear the halted/stalled state for every end point */
 	status = usb_clear_halt(psIntfAdapter->udev, psIntfAdapter->sIntrIn.int_in_pipe);
 	if (status != STATUS_SUCCESS)
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL, "Unable to Clear Halt of Interrupt IN end point. :%d ", status);
+		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			"Unable to Clear Halt of Interrupt IN end point. :%d\n",
+			status);
 
 	status = usb_clear_halt(psIntfAdapter->udev, psIntfAdapter->sBulkIn.bulk_in_pipe);
 	if (status != STATUS_SUCCESS)
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL, "Unable to Clear Halt of Bulk IN end point. :%d ", status);
+		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			"Unable to Clear Halt of Bulk IN end point. :%d\n",
+			status);
 
 	status = usb_clear_halt(psIntfAdapter->udev, psIntfAdapter->sBulkOut.bulk_out_pipe);
 	if (status != STATUS_SUCCESS)
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL, "Unable to Clear Halt of Bulk OUT end point. :%d ", status);
+		bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL,
+			"Unable to Clear Halt of Bulk OUT end point. :%d\n",
+			status);
 
 	return status;
 }
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 7e6afa0..c4644b3 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -27,7 +27,8 @@ GetBulkInRcb(PS_INTERFACE_ADAPTER psIntfAdapter)
 		pRcb = &psIntfAdapter->asUsbRcb[index];
 		pRcb->bUsed = TRUE;
 		pRcb->psIntfAdapter= psIntfAdapter;
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Got Rx desc %d used %d",
+		bcm_dbg(psIntfAdapter->psAdapter, RX, RX_DPC, ALL,
+			"Got Rx desc %d used %d\n",
 			index, atomic_read(&psIntfAdapter->uNumRcbUsed));
 		index = (index + 1) % MAXIMUM_USB_RCB;
 		atomic_set(&psIntfAdapter->uCurrRcb, index);
@@ -73,7 +74,9 @@ static void read_bulk_callback(struct urb *urb)
 		}
 		else
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"Rx URB has got cancelled. status :%d", urb->status);
+			bcm_dbg(Adapter, RX, RX_DPC, ALL,
+				"Rx URB has got cancelled. status :%d\n",
+				urb->status);
 		}
 		pRcb->bUsed = FALSE;
  		atomic_dec(&psIntfAdapter->uNumRcbUsed);
@@ -83,18 +86,22 @@ static void read_bulk_callback(struct urb *urb)
 
 	if(Adapter->bDoSuspend && (Adapter->bPreparingForLowPowerMode))
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"device is going in low power mode while PMU option selected..hence rx packet should not be process");
+		bcm_dbg(Adapter, RX, RX_DPC, ALL,
+			"device is going in low power mode while PMU option selected..hence rx packet should not be process\n");
 		return ;
 	}
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Read back done len %d\n", pLeader->PLength);
+	bcm_dbg(Adapter, RX, RX_DPC, ALL,
+		"Read back done len %d\n", pLeader->PLength);
 	if(!pLeader->PLength)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Leader Length 0");
+		bcm_dbg(Adapter, RX, RX_DPC, ALL, "Leader Length 0\n");
 		atomic_dec(&psIntfAdapter->uNumRcbUsed);
 		return;
 	}
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Leader Status:0x%hX, Length:0x%hX, VCID:0x%hX", pLeader->Status,pLeader->PLength,pLeader->Vcid);
+	bcm_dbg(Adapter, RX, RX_DPC, ALL,
+		"Leader Status:0x%hX, Length:0x%hX, VCID:0x%hX\n",
+		pLeader->Status, pLeader->PLength, pLeader->Vcid);
 	if(MAX_CNTL_PKT_SIZE < pLeader->PLength)
 	{
 		if (netif_msg_rx_err(Adapter))
@@ -125,7 +132,8 @@ static void read_bulk_callback(struct urb *urb)
 	if((ntohs(pLeader->Vcid) == VCID_CONTROL_PACKET) ||
 	    (!(pLeader->Status >= 0x20  &&  pLeader->Status <= 0x3F)))
 	{
-	    BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Received control pkt...");
+		bcm_dbg(psIntfAdapter->psAdapter, RX, RX_CTRL, ALL,
+			"Received control pkt...\n");
 		*(PUSHORT)skb->data = pLeader->Status;
        	memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer +
 			(sizeof(LEADER)), pLeader->PLength);
@@ -144,7 +152,8 @@ static void read_bulk_callback(struct urb *urb)
 		  * Data Packet, Format a proper Ethernet Header
         	  * and give it to the stack
 		  */
-        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt...");
+		bcm_dbg(psIntfAdapter->psAdapter, RX, RX_DATA, ALL,
+			"Received Data pkt...\n");
 		skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES);
 		memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(LEADER), pLeader->PLength);
 		skb->dev = Adapter->dev;
@@ -153,7 +162,8 @@ static void read_bulk_callback(struct urb *urb)
 		skb_put (skb, pLeader->PLength + ETH_HLEN);
 		Adapter->PackInfo[QueueIndex].uiTotalRxBytes+=pLeader->PLength;
 		Adapter->PackInfo[QueueIndex].uiThisPeriodRxBytes+= pLeader->PLength;
-        BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt of len :0x%X", pLeader->PLength);
+		bcm_dbg(psIntfAdapter->psAdapter, RX, RX_DATA, ALL,
+			"Received Data pkt of len :0x%X\n", pLeader->PLength);
 
 		if(netif_running(Adapter->dev))
 		{
@@ -179,7 +189,8 @@ static void read_bulk_callback(struct urb *urb)
 		}
 		else
 		{
-		    BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "i/f not up hance freeing SKB...");
+			bcm_dbg(psIntfAdapter->psAdapter, RX, RX_DATA, ALL,
+				"i/f not up hance freeing SKB...\n");
 			dev_kfree_skb(skb);
 		}
 
@@ -215,7 +226,9 @@ static int ReceiveRcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_RCB pRcb)
 		retval = usb_submit_urb(urb, GFP_ATOMIC);
 		if (retval)
 		{
-			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "failed submitting read urb, error %d", retval);
+			bcm_dbg(psIntfAdapter->psAdapter, RX, RX_DPC, ALL,
+				"failed submitting read urb, error %d\n",
+				retval);
 			//if this return value is because of pipe halt. need to clear this.
 			if(retval == -EPIPE)
 			{
diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index dc315b0..a940d95 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -24,7 +24,9 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 		}
 		else
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"Tx URB has got cancelled. status :%d", urb->status);
+			bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+				"Tx URB has got cancelled. status :%d\n",
+				urb->status);
 		}
 	}
 
@@ -45,7 +47,8 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 			if(urb->status != STATUS_SUCCESS)
 			{
 				psAdapter->bPreparingForLowPowerMode = FALSE ;
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"Idle Mode Request msg failed to reach to Modem");
+				bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+					"Idle Mode Request msg failed to reach to Modem\n");
 				//Signalling the cntrl pkt path in Ioctl
 				wake_up(&psAdapter->lowpower_mode_wait_queue);
 				StartInterruptUrb(psIntfAdapter);
@@ -58,7 +61,8 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 				//since going in Idle mode completed hence making this var false;
 				psAdapter->bPreparingForLowPowerMode = FALSE ;
 
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Host Entered in Idle Mode State...");
+				bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+					"Host Entered in Idle Mode State...\n");
 				//Signalling the cntrl pkt path in Ioctl
 				wake_up(&psAdapter->lowpower_mode_wait_queue);
 			}
@@ -73,7 +77,8 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 			if(urb->status != STATUS_SUCCESS)
 			{
 				psAdapter->bPreparingForLowPowerMode = FALSE ;
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"Shutdown Request Msg failed to reach to Modem");
+				bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+					"Shutdown Request Msg failed to reach to Modem\n");
 				//Signalling the cntrl pkt path in Ioctl
 				wake_up(&psAdapter->lowpower_mode_wait_queue);
 				StartInterruptUrb(psIntfAdapter);
@@ -86,7 +91,8 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 				psAdapter->bShutStatus = TRUE;
 				//since going in shutdown mode completed hence making this var false;
 				psAdapter->bPreparingForLowPowerMode = FALSE ;
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"Host Entered in shutdown Mode State...");
+				bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+					"Host Entered in shutdown Mode State...\n");
 				//Signalling the cntrl pkt path in Ioctl
 				wake_up(&psAdapter->lowpower_mode_wait_queue);
 			}
@@ -95,7 +101,8 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 		if(psAdapter->bDoSuspend && bpowerDownMsg)
 		{
 			//issuing bus suspend request
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"Issuing the Bus suspend request to USB stack");
+			bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+				"Issuing the Bus suspend request to USB stack\n");
 			psIntfAdapter->bPreparingForBusSuspend = TRUE;
 			schedule_work(&psIntfAdapter->usbSuspendWork);
 
@@ -121,7 +128,8 @@ static PUSB_TCB GetBulkOutTcb(PS_INTERFACE_ADAPTER psIntfAdapter)
 		pTcb = &psIntfAdapter->asUsbTcb[index];
 		pTcb->bUsed = TRUE;
 		pTcb->psIntfAdapter= psIntfAdapter;
-		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Got Tx desc %d used %d",
+		bcm_dbg(psIntfAdapter->psAdapter, TX, NEXT_SEND, ALL,
+			"Got Tx desc %d used %d\n",
 			index, atomic_read(&psIntfAdapter->uNumTcbUsed));
 		index = (index + 1) % MAXIMUM_USB_TCB;
 		atomic_set(&psIntfAdapter->uCurrTcb, index);
@@ -146,7 +154,8 @@ static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID
 	memcpy(urb->transfer_buffer, data, len);
 	urb->transfer_buffer_length = len;
 
-	BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Sending Bulk out packet\n");
+	bcm_dbg(psIntfAdapter->psAdapter, TX, NEXT_SEND, ALL,
+		"Sending Bulk out packet\n");
 	//For T3B,INT OUT end point will be used as bulk out end point
 	if((psIntfAdapter->psAdapter->chip_id == T3B) && (psIntfAdapter->bHighSpeedDevice == TRUE))
 	{
@@ -171,7 +180,9 @@ static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID
 		retval = usb_submit_urb(urb, GFP_ATOMIC);
 		if (retval)
 		{
-			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "failed submitting write urb, error %d", retval);
+			bcm_dbg(psIntfAdapter->psAdapter, TX, NEXT_SEND, ALL,
+				"failed submitting write urb, error %d\n",
+				retval);
 			if(retval == -EPIPE)
 			{
 				psIntfAdapter->psAdapter->bEndPointHalted = TRUE ;
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index a55d422..b77ed10 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -21,10 +21,11 @@ static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
 	INT 	i = 0;
 	struct timeval tv;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "=====>\n");
+	bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL, "=====>\n");
 	if(NULL == Adapter)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Adapter found NULL!\n");
+		bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL,
+			"Adapter found NULL!\n");
 		return;
 	}
 
@@ -55,7 +56,7 @@ static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
 			}
 		}
 	}
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "<=====\n");
+	bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL, "<=====\n");
 	return;
 
 }
@@ -77,12 +78,15 @@ static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
 ***********************************************************************/
 static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 {
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IsPacketAllowedForFlow ===>");
+	bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL,
+		"IsPacketAllowedForFlow ===>\n");
 	/* Validate the parameters */
 	if(NULL == Adapter || (psSF < Adapter->PackInfo &&
 		(uintptr_t)psSF > (uintptr_t) &Adapter->PackInfo[HiPriority]))
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Got wrong Parameters:Adapter: %p, QIndex: %zd\n", Adapter, (psSF-Adapter->PackInfo));
+		bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL,
+			"IPAFF: Got wrong Parameters:Adapter: %p, QIndex: %zd\n",
+			Adapter, (psSF-Adapter->PackInfo));
 		return 0;
 	}
 
@@ -94,16 +98,19 @@ static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 		}
 		else
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Not enough tokens in queue %zd Available %u\n",
+			bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL,
+				"Not enough tokens in queue %zd Available %u\n",
 				psSF-Adapter->PackInfo, psSF->uiCurrentTokenCount);
 			psSF->uiPendedLast = 1;
 		}
 	}
 	else
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Queue %zd not valid\n", psSF-Adapter->PackInfo);
+		bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL,
+			"IPAFF: Queue %zd not valid\n", psSF-Adapter->PackInfo);
 	}
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IsPacketAllowedForFlow <===");
+	bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL,
+		"IsPacketAllowedForFlow <===\n");
 	return 0;
 }
 
@@ -119,10 +126,11 @@ static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
 	INT  	Status=STATUS_FAILURE;
 	UINT uiIndex =0,PktLen = 0;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, SEND_QUEUE, DBG_LVL_ALL, "=====>");
+	bcm_dbg(Adapter, TX, SEND_QUEUE, ALL, "=====>\n");
 	if(!Adapter || !Packet || !psSF)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, SEND_QUEUE, DBG_LVL_ALL, "Got NULL Adapter or Packet");
+		bcm_dbg(Adapter, TX, SEND_QUEUE, ALL,
+			"Got NULL Adapter or Packet\n");
 		return -EINVAL;
 	}
 
@@ -140,7 +148,7 @@ static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
 				Adapter->aTxPktSizeHist[uiIndex]++;
 		}
 	}
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, SEND_QUEUE, DBG_LVL_ALL, "<=====");
+	bcm_dbg(Adapter, TX, SEND_QUEUE, ALL, "<=====\n");
 	return Status;
 }
 
@@ -164,20 +172,23 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 	int				iPacketLen=0;
 
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "%zd ====>", (psSF-Adapter->PackInfo));
+	bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+		"%zd ====>\n", (psSF-Adapter->PackInfo));
 	if((psSF != &Adapter->PackInfo[HiPriority]) && Adapter->LinkUpStatus && atomic_read(&psSF->uiPerSFTxResourceCount))//Get data packet
   	{
 		if(!psSF->ucDirection )
 			return;
 
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "UpdateTokenCount ");
+		bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "UpdateTokenCount\n");
 		if(Adapter->IdleMode || Adapter->bPreparingForLowPowerMode)
 			return;	/* in idle mode */
 
 		// Check for Free Descriptors
 		if(atomic_read(&Adapter->CurrNumFreeTxDesc) <= MINIMUM_PENDING_DESCRIPTORS)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, " No Free Tx Descriptor(%d) is available for Data pkt..",atomic_read(&Adapter->CurrNumFreeTxDesc));
+			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+				"No Free Tx Descriptor(%d) is available for Data pkt..\n",
+				atomic_read(&Adapter->CurrNumFreeTxDesc));
 			return ;
 		}
 
@@ -186,7 +197,8 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 
 		if(QueuePacket)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Dequeuing Data Packet");
+			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+				"Dequeuing Data Packet\n");
 
 			if(psSF->bEthCSSupport)
 				iPacketLen = QueuePacket->len;
@@ -196,7 +208,8 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 			iPacketLen<<=3;
 			if(iPacketLen <= GetSFTokenCount(Adapter, psSF))
 			{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Allowed bytes %d",
+				bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+					"Allowed bytes %d\n",
 					(iPacketLen >> 3));
 
 				DEQUEUEPACKET(psSF->FirstTxQueue,psSF->LastTxQueue);
@@ -210,8 +223,11 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 			}
 			else
 			{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "For Queue: %zd\n", psSF-Adapter->PackInfo);
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "\nAvailable Tokens = %d required = %d\n",
+				bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+					"For Queue: %zd\n",
+					psSF-Adapter->PackInfo);
+				bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+					"Available Tokens = %d required = %d\n",
 					psSF->uiCurrentTokenCount, iPacketLen);
 				//this part indicates that because of non-availability of the tokens
 				//pkt has not been send out hence setting the pending flag indicating the host to send it out
@@ -237,7 +253,8 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 			[(atomic_read(&Adapter->index_rd_txcntrlpkt)%MAX_CNTRL_PKTS)];
 			if(pControlPacket)
 			{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Sending Control packet");
+				bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+					"Sending Control packet\n");
 				Status = SendControlPacket(Adapter, pControlPacket);
 				if(STATUS_SUCCESS==Status)
 				{
@@ -252,11 +269,13 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 					spin_unlock_bh(&psSF->SFQueueLock);
 				}
 				else
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "SendControlPacket Failed\n");
+					bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+						"SendControlPacket Failed\n");
 			}
 			else
 			{
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, " Control Pkt is not available, Indexing is wrong....");
+				bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+					"Control Pkt is not available, Indexing is wrong....\n");
 			}
 	   	}
 	}
@@ -280,24 +299,24 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
 
 	BOOLEAN exit_flag = TRUE ;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "=====>");
+	bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "=====>\n");
 
 	if(NULL == Adapter)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX,TX_PACKETS, DBG_LVL_ALL, "Got NULL Adapter");
+		bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "Got NULL Adapter\n");
 		return;
 	}
 	if(Adapter->device_removed == TRUE)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Device removed");
+		bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "Device removed\n");
 		return;
 	}
 
-    BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "\nUpdateTokenCount ====>\n");
+	bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "UpdateTokenCount ====>\n");
 
 	UpdateTokenCount(Adapter);
 
-    BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "\nPruneQueueAllSF ====>\n");
+	bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "PruneQueueAllSF ====>\n");
 
 	PruneQueueAllSF(Adapter);
 
@@ -312,7 +331,8 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
 			Adapter->PackInfo[iIndex].uiPendedLast &&
 			Adapter->PackInfo[iIndex].uiCurrentBytesOnHost)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Calling CheckAndSendPacketFromIndex..");
+			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+				"Calling CheckAndSendPacketFromIndex..\n");
 			CheckAndSendPacketFromIndex(Adapter, &Adapter->PackInfo[iIndex]);
 			uiPrevTotalCount--;
 		}
@@ -331,7 +351,8 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
 				Adapter->PackInfo[iIndex].uiCurrentBytesOnHost &&
 				!Adapter->PackInfo[iIndex].uiPendedLast )
 			{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Calling CheckAndSendPacketFromIndex..");
+				bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+					"Calling CheckAndSendPacketFromIndex..\n");
 				CheckAndSendPacketFromIndex(Adapter, &Adapter->PackInfo[iIndex]);
 				uiPrevTotalCount--;
 				exit_flag = FALSE;
@@ -340,7 +361,8 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
 
 		if(Adapter->IdleMode || Adapter->bPreparingForLowPowerMode)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "In Idle Mode\n");
+			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+				"In Idle Mode\n");
 			break;
 		}
 		if(exit_flag == TRUE )
@@ -349,5 +371,5 @@ VOID transmit_packets(PMINI_ADAPTER Adapter)
 
 	update_per_cid_rx  (Adapter);
 	Adapter->txtransmit_running = 0;
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "<======");
+	bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "<======\n");
 }
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 709ba00..accb389 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -30,10 +30,12 @@ INT InitAdapter(PMINI_ADAPTER psAdapter)
 {
 	int i = 0;
 	INT Status = STATUS_SUCCESS;
-	BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Initialising Adapter = %p", psAdapter);
+	bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL,
+		"Initialising Adapter = %p\n", psAdapter);
 
 	if (psAdapter == NULL) {
-		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Adapter is NULL");
+		bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL,
+			"Adapter is NULL\n");
 		return -EINVAL;
 	}
 
@@ -61,36 +63,42 @@ INT InitAdapter(PMINI_ADAPTER psAdapter)
 	for (i = 0; i < MAX_CNTRL_PKTS; i++) {
 		psAdapter->txctlpacket[i] = kmalloc(MAX_CNTL_PKT_SIZE, GFP_KERNEL);
 		if (!psAdapter->txctlpacket[i]) {
-			BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "No More Cntl pkts got, max got is %d", i);
+			bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL,
+				"No More Cntl pkts got, max got is %d\n", i);
 			return -ENOMEM;
 		}
 	}
 
 	if (AllocAdapterDsxBuffer(psAdapter)) {
-		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Failed to allocate DSX buffers");
+		bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL,
+			"Failed to allocate DSX buffers\n");
 		return -EINVAL;
 	}
 
 	/* Initialize PHS interface */
 	if (phs_init(&psAdapter->stBCMPhsContext, psAdapter) != 0) {
-		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "%s:%s:%d:Error PHS Init Failed=====>\n", __FILE__, __func__, __LINE__);
+		bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL,
+			"%s:%s:%d:Error PHS Init Failed=====>\n",
+			__FILE__, __func__, __LINE__);
 		return -ENOMEM;
 	}
 
 	Status = BcmAllocFlashCSStructure(psAdapter);
 	if (Status) {
-		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Memory Allocation for Flash structure failed");
+		bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL,
+			"Memory Allocation for Flash structure failed\n");
 		return Status;
 	}
 
 	Status = vendorextnInit(psAdapter);
 
 	if (STATUS_SUCCESS != Status) {
-		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Vendor Init Failed");
+		bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL,
+			"Vendor Init Failed\n");
 		return Status;
 	}
 
-	BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Adapter initialised");
+	bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL, "Adapter initialised\n");
 
 	return STATUS_SUCCESS;
 }
@@ -116,7 +124,9 @@ VOID AdapterFree(PMINI_ADAPTER Adapter)
 
 	/* FIXME: use proper wait_event and refcounting */
 	while (atomic_read(&Adapter->ApplicationRunning)) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Waiting for Application to close.. %d\n", atomic_read(&Adapter->ApplicationRunning));
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"Waiting for Application to close.. %d\n",
+			atomic_read(&Adapter->ApplicationRunning));
 		msleep(100);
 	}
 	unregister_control_device_interface(Adapter);
@@ -191,15 +201,21 @@ static int BcmFileDownload(PMINI_ADAPTER Adapter, const char *path, unsigned int
 	flp = open_firmware_file(Adapter, path);
 	if (!flp) {
 		errorno = -ENOENT;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Unable to Open %s\n", path);
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"Unable to Open %s\n", path);
 		goto exit_download;
 	}
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Opened file is = %s and length =0x%lx to be downloaded at =0x%x", path, (unsigned long)flp->f_dentry->d_inode->i_size, loc);
+	bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+		"Opened file is = %s and length =0x%lx to be downloaded at =0x%x\n",
+		path, (unsigned long)flp->f_dentry->d_inode->i_size, loc);
 	do_gettimeofday(&tv);
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "download start %lx", ((tv.tv_sec * 1000) + (tv.tv_usec / 1000)));
+	bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL, "download start %lx\n",
+		((tv.tv_sec * 1000) + (tv.tv_usec / 1000)));
 	if (Adapter->bcm_file_download(Adapter->pvInterfaceAdapter, flp, loc)) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Failed to download the firmware with error %x!!!", -EIO);
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"Failed to download the firmware with error %x!!!\n",
+			-EIO);
 		errorno = -EIO;
 		goto exit_download;
 	}
@@ -208,7 +224,8 @@ static int BcmFileDownload(PMINI_ADAPTER Adapter, const char *path, unsigned int
 	vfs_llseek(flp, 0, 0);
 	set_fs(oldfs);
 	if (Adapter->bcm_file_readback_from_chip(Adapter->pvInterfaceAdapter, flp, loc)) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Failed to read back firmware!");
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"Failed to read back firmware!\n");
 		errorno = -EIO;
 		goto exit_download;
 	}
@@ -242,9 +259,9 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 	PLINK_REQUEST pLinkReq = NULL;
 	PUCHAR pucAddIndication = NULL;
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "======>");
+	bcm_dbg(Adapter, TX, TX_CONTROL, ALL, "======>\n");
 	if (!ioBuffer) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Got Null Buffer\n");
+		bcm_dbg(Adapter, TX, TX_CONTROL, ALL, "Got Null Buffer\n");
 		return -EINVAL;
 	}
 
@@ -256,7 +273,8 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 		pLinkReq->szData[1] == LINK_SYNC_UP_SUBTYPE) {
 
 		/* Got sync down in SHUTDOWN..we could not process this. */
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "SYNC DOWN Request in Shut Down Mode..\n");
+		bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+			"SYNC DOWN Request in Shut Down Mode..\n");
 		return STATUS_FAILURE;
 	}
 
@@ -266,14 +284,17 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 			pLinkReq->szData[0] == NETWORK_ENTRY_REQ_PAYLOAD)) /* Net Entry Command */ {
 
 		if (Adapter->LinkStatus > PHY_SYNC_ACHIVED) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "LinkStatus is Greater than PHY_SYN_ACHIEVED");
+			bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+				"LinkStatus is Greater than PHY_SYN_ACHIEVED\n");
 			return STATUS_FAILURE;
 		}
 
 		if (TRUE == Adapter->bShutStatus) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "SYNC UP IN SHUTDOWN..Device WakeUp\n");
+			bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+				"SYNC UP IN SHUTDOWN..Device WakeUp\n");
 			if (Adapter->bTriedToWakeUpFromlowPowerMode == FALSE) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Waking up for the First Time..\n");
+				bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+					"Waking up for the First Time..\n");
 				Adapter->usIdleModePattern = ABORT_SHUTDOWN_MODE; /* change it to 1 for current support. */
 				Adapter->bWakeUpDevice = TRUE;
 				wake_up(&Adapter->process_rx_cntrlpkt);
@@ -283,11 +304,13 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 					return Status;
 
 				if (Adapter->bShutStatus) {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Shutdown Mode Wake up Failed - No Wake Up Received\n");
+					bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+						"Shutdown Mode Wake up Failed - No Wake Up Received\n");
 					return STATUS_FAILURE;
 				}
 			} else {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Wakeup has been tried already...\n");
+				bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+					"Wakeup has been tried already...\n");
 			}
 		}
 	}
@@ -299,14 +322,17 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 
 			if ((pLeader->Status == LINK_UP_CONTROL_REQ) && (pLinkReq->szData[0] == LINK_DOWN_REQ_PAYLOAD))	{
 				if ((pLinkReq->szData[1] == LINK_SYNC_DOWN_SUBTYPE)) {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Link Down Sent in Idle Mode\n");
+					bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+						"Link Down Sent in Idle Mode\n");
 					Adapter->usIdleModePattern = ABORT_IDLE_SYNCDOWN; /* LINK DOWN sent in Idle Mode */
 				} else {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "ABORT_IDLE_MODE pattern is being written\n");
+					bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+						"ABORT_IDLE_MODE pattern is being written\n");
 					Adapter->usIdleModePattern = ABORT_IDLE_REG;
 				}
 			} else {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "ABORT_IDLE_MODE pattern is being written\n");
+				bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+					"ABORT_IDLE_MODE pattern is being written\n");
 				Adapter->usIdleModePattern = ABORT_IDLE_MODE;
 			}
 
@@ -327,7 +353,8 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 				return Status;
 
 			if (Adapter->IdleMode) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Idle Mode Wake up Failed - No Wake Up Received\n");
+				bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+					"Idle Mode Wake up Failed - No Wake Up Received\n");
 				return STATUS_FAILURE;
 			}
 		} else {
@@ -342,8 +369,10 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 	pktlen = pLeader->PLength;
 	ctrl_buff = (char *)Adapter->txctlpacket[atomic_read(&Adapter->index_wr_txcntrlpkt)%MAX_CNTRL_PKTS];
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Control packet to be taken =%d and address is =%pincoming address is =%p and packet len=%x",
-			atomic_read(&Adapter->index_wr_txcntrlpkt), ctrl_buff, ioBuffer, pktlen);
+	bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+		"Control packet to be taken =%d and address is =%pincoming address is =%p and packet len=%x\n",
+		atomic_read(&Adapter->index_wr_txcntrlpkt), ctrl_buff, ioBuffer,
+		pktlen);
 	if (ctrl_buff) {
 		if (pLeader) {
 			if ((pLeader->Status == 0x80) ||
@@ -359,7 +388,8 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 				Status = StoreCmControlResponseMessage(Adapter, pucAddIndication, &pktlen);
 				if (Status != 1) {
 					ClearTargetDSXBuffer(Adapter, ((stLocalSFAddIndicationAlt *)pucAddIndication)->u16TID, FALSE);
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, " Error Restoring The DSX Control Packet. Dsx Buffers on Target may not be Setup Properly ");
+					bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+						"Error Restoring The DSX Control Packet. Dsx Buffers on Target may not be Setup Properly\n");
 					return STATUS_FAILURE;
 				}
 				/*
@@ -374,10 +404,13 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 			return -EINVAL;
 
 		memset(ctrl_buff, 0, pktlen+LEADER_SIZE);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Copying the Control Packet Buffer with length=%d\n", pLeader->PLength);
+		bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+			"Copying the Control Packet Buffer with length=%d\n",
+			pLeader->PLength);
 		*(PLEADER)ctrl_buff = *pLeader;
 		memcpy(ctrl_buff + LEADER_SIZE, ((PUCHAR)ioBuffer + LEADER_SIZE), pLeader->PLength);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Enqueuing the Control Packet");
+		bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+			"Enqueuing the Control Packet\n");
 
 		/* Update the statistics counters */
 		spin_lock_bh(&Adapter->PackInfo[HiPriority].SFQueueLock);
@@ -387,20 +420,23 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 		spin_unlock_bh(&Adapter->PackInfo[HiPriority].SFQueueLock);
 		Adapter->PackInfo[HiPriority].bValid = TRUE;
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "CurrBytesOnHost: %x bValid: %x",
-				Adapter->PackInfo[HiPriority].uiCurrentBytesOnHost,
-				Adapter->PackInfo[HiPriority].bValid);
+		bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+			"CurrBytesOnHost: %x bValid: %x\n",
+			Adapter->PackInfo[HiPriority].uiCurrentBytesOnHost,
+			Adapter->PackInfo[HiPriority].bValid);
 		Status = STATUS_SUCCESS;
 		/*Queue the packet for transmission */
 		atomic_inc(&Adapter->index_wr_txcntrlpkt);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Calling transmit_packets");
+		bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+			"Calling transmit_packets\n");
 		atomic_set(&Adapter->TxPktAvail, 1);
 		wake_up(&Adapter->tx_packet_wait_queue);
 	} else {
 		Status = -ENOMEM;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "mem allocation Failed");
+		bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+			"mem allocation Failed\n");
 	}
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "<====");
+	bcm_dbg(Adapter, TX, TX_CONTROL, ALL, "<====\n");
 	return Status;
 }
 
@@ -418,12 +454,12 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
 *****************************************************************/
 static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, PLINK_REQUEST pstStatisticsPtrRequest)
 {
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "======>");
+	bcm_dbg(Adapter, RX, RX_DPC, ALL, "======>\n");
 	pstStatisticsPtrRequest->Leader.Status = STATS_POINTER_REQ_STATUS;
 	pstStatisticsPtrRequest->Leader.PLength = sizeof(ULONG); /* minimum 4 bytes */
 	pstStatisticsPtrRequest->szData[0] = STATISTICS_POINTER_REQ;
 	CopyBufferToControlPacket(Adapter, pstStatisticsPtrRequest);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "<=====");
+	bcm_dbg(Adapter, RX, RX_DPC, ALL, "<=====\n");
 	return;
 }
 #endif
@@ -441,16 +477,18 @@ static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, PLINK_REQUEST ps
 VOID LinkMessage(PMINI_ADAPTER Adapter)
 {
 	PLINK_REQUEST pstLinkRequest = NULL;
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "=====>");
+	bcm_dbg(Adapter, OTHERS, LINK_UP_MSG, ALL, "=====>\n");
 	if (Adapter->LinkStatus == SYNC_UP_REQUEST && Adapter->AutoSyncup) {
 		pstLinkRequest = kzalloc(sizeof(LINK_REQUEST), GFP_ATOMIC);
 		if (!pstLinkRequest) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Can not allocate memory for Link request!");
+			bcm_dbg(Adapter, OTHERS, LINK_UP_MSG, ALL,
+				"Can not allocate memory for Link request!\n");
 			return;
 		}
 		/* sync up request... */
 		Adapter->LinkStatus = WAIT_FOR_SYNC; /* current link status */
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Requesting For SyncUp...");
+		bcm_dbg(Adapter, OTHERS, LINK_UP_MSG, ALL,
+			"Requesting For SyncUp...\n");
 		pstLinkRequest->szData[0] = LINK_UP_REQ_PAYLOAD;
 		pstLinkRequest->szData[1] = LINK_SYNC_UP_SUBTYPE;
 		pstLinkRequest->Leader.Status = LINK_UP_CONTROL_REQ;
@@ -460,22 +498,25 @@ VOID LinkMessage(PMINI_ADAPTER Adapter)
 	} else if (Adapter->LinkStatus == PHY_SYNC_ACHIVED && Adapter->AutoLinkUp) {
 		pstLinkRequest = kzalloc(sizeof(LINK_REQUEST), GFP_ATOMIC);
 		if (!pstLinkRequest) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Can not allocate memory for Link request!");
+			bcm_dbg(Adapter, OTHERS, LINK_UP_MSG, ALL,
+				"Can not allocate memory for Link request!\n");
 			return;
 		}
 		/* LINK_UP_REQUEST */
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Requesting For LinkUp...");
+		bcm_dbg(Adapter, OTHERS, LINK_UP_MSG, ALL,
+			"Requesting For LinkUp...\n");
 		pstLinkRequest->szData[0] = LINK_UP_REQ_PAYLOAD;
 		pstLinkRequest->szData[1] = LINK_NET_ENTRY;
 		pstLinkRequest->Leader.Status = LINK_UP_CONTROL_REQ;
 		pstLinkRequest->Leader.PLength = sizeof(ULONG);
 	}
 	if (pstLinkRequest) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Calling CopyBufferToControlPacket");
+		bcm_dbg(Adapter, OTHERS, LINK_UP_MSG, ALL,
+			"Calling CopyBufferToControlPacket\n");
 		CopyBufferToControlPacket(Adapter, pstLinkRequest);
 		kfree(pstLinkRequest);
 	}
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "LinkMessage <=====");
+	bcm_dbg(Adapter, OTHERS, LINK_UP_MSG, ALL, "LinkMessage <=====\n");
 	return;
 }
 
@@ -491,10 +532,11 @@ VOID LinkMessage(PMINI_ADAPTER Adapter)
 ************************************************************************/
 VOID StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer)
 {
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "%s====>", __func__);
+	bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "%s====>\n", __func__);
 	Adapter->StatisticsPointer = ntohl(*(__be32 *)pvBuffer);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "Stats at %x", (UINT)Adapter->StatisticsPointer);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "%s <====", __func__);
+	bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+		"Stats at %x\n", (UINT)Adapter->StatisticsPointer);
+	bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "%s <====\n", __func__);
 	return;
 }
 
@@ -510,7 +552,7 @@ VOID StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer)
 ***********************************************************************/
 VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
 {
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "=====>");
+	bcm_dbg(Adapter, RX, RX_DPC, ALL, "=====>\n");
 
 	if (*pucBuffer == LINK_UP_ACK) {
 		switch (*(pucBuffer+1)) {
@@ -532,7 +574,7 @@ VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
 				break;
 
 		case LINKUP_DONE:
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "LINKUP_DONE");
+			bcm_dbg(Adapter, RX, RX_DPC, ALL, "LINKUP_DONE\n");
 			Adapter->LinkStatus = LINKUP_DONE;
 			Adapter->bPHSEnabled = *(pucBuffer+3);
 			Adapter->bETHCSEnabled = *(pucBuffer+4) & ETH_CS_MASK;
@@ -576,11 +618,12 @@ VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
 	} else if (SET_MAC_ADDRESS_RESPONSE == *pucBuffer) {
 		PUCHAR puMacAddr = (pucBuffer + 1);
 		Adapter->LinkStatus = SYNC_UP_REQUEST;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "MAC address response, sending SYNC_UP");
+		bcm_dbg(Adapter, RX, RX_DPC, ALL,
+			"MAC address response, sending SYNC_UP\n");
 		LinkMessage(Adapter);
 		memcpy(Adapter->dev->dev_addr, puMacAddr, MAC_ADDRESS_SIZE);
 	}
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "%s <=====", __func__);
+	bcm_dbg(Adapter, RX, RX_DPC, ALL, "%s <=====\n", __func__);
 	return;
 }
 
@@ -593,7 +636,7 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
 	stIdleResponse.Leader.Status = IDLE_MESSAGE;
 	stIdleResponse.Leader.PLength = IDLE_MODE_PAYLOAD_LENGTH;
 	stIdleResponse.szData[0] = GO_TO_IDLE_MODE_PAYLOAD;
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, " ============>");
+	bcm_dbg(Adapter, RX, RX_DPC, ALL, "============>\n");
 
 	/*********************************
 	 *down_trylock -
@@ -618,7 +661,8 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
 			up(&Adapter->LowPowerModeSync);
 
 		stIdleResponse.szData[1] = TARGET_CAN_NOT_GO_TO_IDLE_MODE; /* NACK- device access is going on. */
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "HOST IS NACKING Idle mode To F/W!!!!!!!!");
+		bcm_dbg(Adapter, RX, RX_DPC, ALL,
+			"HOST IS NACKING Idle mode To F/W!!!!!!!!\n");
 		Adapter->bPreparingForLowPowerMode = FALSE;
 	} else {
 		stIdleResponse.szData[1] = TARGET_CAN_GO_TO_IDLE_MODE; /* 2; Idle ACK */
@@ -630,7 +674,9 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
 
 			/* Wake the LED Thread with IDLEMODE_ENTER State */
 			Adapter->DriverState = LOWPOWER_MODE_ENTER;
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "LED Thread is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld", jiffies);
+			bcm_dbg(Adapter, RX, RX_DPC, ALL,
+				"LED Thread is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld\n",
+				jiffies);
 			wake_up(&Adapter->LEDInfo.notify_led_event);
 
 			/* Wait for 1 SEC for LED to OFF */
@@ -641,12 +687,14 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
 				stIdleResponse.szData[1] = TARGET_CAN_NOT_GO_TO_IDLE_MODE; /* NACK- device access is going on. */
 				Adapter->DriverState = NORMAL_OPERATION;
 				wake_up(&Adapter->LEDInfo.notify_led_event);
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "NACKING Idle mode as time out happen from LED side!!!!!!!!");
+				bcm_dbg(Adapter, RX, RX_DPC, ALL,
+					"NACKING Idle mode as time out happen from LED side!!!!!!!!\n");
 			}
 		}
 
 		if (stIdleResponse.szData[1] == TARGET_CAN_GO_TO_IDLE_MODE) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "ACKING IDLE MODE !!!!!!!!!");
+			bcm_dbg(Adapter, RX, RX_DPC, ALL,
+				"ACKING IDLE MODE !!!!!!!!!\n");
 			down(&Adapter->rdmwrmsync);
 			Adapter->bPreparingForLowPowerMode = TRUE;
 			up(&Adapter->rdmwrmsync);
@@ -671,7 +719,9 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
 		StartInterruptUrb((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
 	}
 	do_gettimeofday(&tv);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "IdleMode Msg submitter to Q :%ld ms", tv.tv_sec * 1000 + tv.tv_usec / 1000);
+	bcm_dbg(Adapter, RX, RX_DPC, ALL,
+		"IdleMode Msg submitter to Q :%ld ms\n",
+		tv.tv_sec * 1000 + tv.tv_usec / 1000);
 }
 
 /******************************************************************
@@ -691,21 +741,31 @@ VOID DumpPackInfo(PMINI_ADAPTER Adapter)
 	S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
 
 	for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES; uiLoopIndex++) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "*********** Showing Details Of Queue %d***** ******", uiLoopIndex);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"*********** Showing Details Of Queue %d***** ******\n",
+			uiLoopIndex);
 		if (FALSE == Adapter->PackInfo[uiLoopIndex].bValid) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "bValid is FALSE for %X index\n", uiLoopIndex);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"bValid is FALSE for %X index\n", uiLoopIndex);
 			continue;
 		}
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, " Dumping	SF Rule Entry For SFID %lX\n", Adapter->PackInfo[uiLoopIndex].ulSFID);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, " ucDirection %X\n", Adapter->PackInfo[uiLoopIndex].ucDirection);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"Dumping	SF Rule Entry For SFID %lX\n",
+			Adapter->PackInfo[uiLoopIndex].ulSFID);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "ucDirection %X\n",
+			Adapter->PackInfo[uiLoopIndex].ucDirection);
 
 		if (Adapter->PackInfo[uiLoopIndex].ucIpVersion == IPV6)
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "Ipv6 Service Flow\n");
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"Ipv6 Service Flow\n");
 		else
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "Ipv4 Service Flow\n");
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"Ipv4 Service Flow\n");
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "SF Traffic Priority %X\n", Adapter->PackInfo[uiLoopIndex].u8TrafficPriority);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"SF Traffic Priority %X\n",
+			Adapter->PackInfo[uiLoopIndex].u8TrafficPriority);
 
 		for (uiClsfrIndex = 0; uiClsfrIndex < MAX_CLASSIFIERS; uiClsfrIndex++) {
 			pstClassifierEntry = &Adapter->astClassifierTable[uiClsfrIndex];
@@ -715,99 +775,201 @@ VOID DumpPackInfo(PMINI_ADAPTER Adapter)
 			if (pstClassifierEntry->ulSFID != Adapter->PackInfo[uiLoopIndex].ulSFID)
 				continue;
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tDumping Classifier Rule Entry For Index: %X Classifier Rule ID : %X\n", uiClsfrIndex, pstClassifierEntry->uiClassifierRuleIndex);
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tDumping Classifier Rule Entry For Index: %X usVCID_Value : %X\n", uiClsfrIndex, pstClassifierEntry->usVCID_Value);
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tDumping Classifier Rule Entry For Index: %X bProtocolValid : %X\n", uiClsfrIndex, pstClassifierEntry->bProtocolValid);
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tDumping Classifier Rule Entry For Index: %X bTOSValid : %X\n", uiClsfrIndex, pstClassifierEntry->bTOSValid);
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tDumping Classifier Rule Entry For Index: %X bDestIpValid : %X\n", uiClsfrIndex, pstClassifierEntry->bDestIpValid);
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tDumping Classifier Rule Entry For Index: %X bSrcIpValid : %X\n", uiClsfrIndex, pstClassifierEntry->bSrcIpValid);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tDumping Classifier Rule Entry For Index: %X Classifier Rule ID : %X\n",
+				uiClsfrIndex,
+				pstClassifierEntry->uiClassifierRuleIndex);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tDumping Classifier Rule Entry For Index: %X usVCID_Value : %X\n",
+				uiClsfrIndex, pstClassifierEntry->usVCID_Value);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tDumping Classifier Rule Entry For Index: %X bProtocolValid : %X\n",
+				uiClsfrIndex,
+				pstClassifierEntry->bProtocolValid);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tDumping Classifier Rule Entry For Index: %X bTOSValid : %X\n",
+				uiClsfrIndex, pstClassifierEntry->bTOSValid);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tDumping Classifier Rule Entry For Index: %X bDestIpValid : %X\n",
+				uiClsfrIndex, pstClassifierEntry->bDestIpValid);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tDumping Classifier Rule Entry For Index: %X bSrcIpValid : %X\n",
+				uiClsfrIndex, pstClassifierEntry->bSrcIpValid);
 
 			for (uiIndex = 0; uiIndex < MAX_PORT_RANGE; uiIndex++) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tusSrcPortRangeLo:%X\n", pstClassifierEntry->usSrcPortRangeLo[uiIndex]);
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tusSrcPortRangeHi:%X\n", pstClassifierEntry->usSrcPortRangeHi[uiIndex]);
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tusDestPortRangeLo:%X\n", pstClassifierEntry->usDestPortRangeLo[uiIndex]);
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tusDestPortRangeHi:%X\n", pstClassifierEntry->usDestPortRangeHi[uiIndex]);
+				bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+					"\tusSrcPortRangeLo:%X\n",
+					pstClassifierEntry->usSrcPortRangeLo[uiIndex]);
+				bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+					"\tusSrcPortRangeHi:%X\n",
+					pstClassifierEntry->usSrcPortRangeHi[uiIndex]);
+				bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+					"\tusDestPortRangeLo:%X\n",
+					pstClassifierEntry->usDestPortRangeLo[uiIndex]);
+				bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+					"\tusDestPortRangeHi:%X\n",
+					pstClassifierEntry->usDestPortRangeHi[uiIndex]);
 			}
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tucIPSourceAddressLength : 0x%x\n", pstClassifierEntry->ucIPSourceAddressLength);
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tucIPDestinationAddressLength : 0x%x\n", pstClassifierEntry->ucIPDestinationAddressLength);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tucIPSourceAddressLength : 0x%x\n",
+				pstClassifierEntry->ucIPSourceAddressLength);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tucIPDestinationAddressLength : 0x%x\n",
+				pstClassifierEntry->ucIPDestinationAddressLength);
 			for (uiIndex = 0; uiIndex < pstClassifierEntry->ucIPSourceAddressLength; uiIndex++) {
 				if (Adapter->PackInfo[uiLoopIndex].ucIpVersion == IPV6)	{
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tIpv6 ulSrcIpAddr :\n");
+					bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+						"\tIpv6 ulSrcIpAddr :\n");
 					DumpIpv6Address(pstClassifierEntry->stSrcIpAddress.ulIpv6Addr);
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tIpv6 ulSrcIpMask :\n");
+					bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+						"\tIpv6 ulSrcIpMask :\n");
 					DumpIpv6Address(pstClassifierEntry->stSrcIpAddress.ulIpv6Mask);
 				} else {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulSrcIpAddr:%lX\n", pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[uiIndex]);
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulSrcIpMask:%lX\n", pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[uiIndex]);
+					bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+						"\tulSrcIpAddr:%lX\n",
+						pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[uiIndex]);
+					bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+						"\tulSrcIpMask:%lX\n",
+						pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[uiIndex]);
 				}
 			}
 
 			for (uiIndex = 0; uiIndex < pstClassifierEntry->ucIPDestinationAddressLength; uiIndex++) {
 				if (Adapter->PackInfo[uiLoopIndex].ucIpVersion == IPV6) {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tIpv6 ulDestIpAddr :\n");
+					bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+						"\tIpv6 ulDestIpAddr :\n");
 					DumpIpv6Address(pstClassifierEntry->stDestIpAddress.ulIpv6Addr);
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tIpv6 ulDestIpMask :\n");
+					bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+						"\tIpv6 ulDestIpMask :\n");
 					DumpIpv6Address(pstClassifierEntry->stDestIpAddress.ulIpv6Mask);
 				} else {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulDestIpAddr:%lX\n", pstClassifierEntry->stDestIpAddress.ulIpv4Addr[uiIndex]);
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulDestIpMask:%lX\n", pstClassifierEntry->stDestIpAddress.ulIpv4Mask[uiIndex]);
+					bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+						"\tulDestIpAddr:%lX\n",
+						pstClassifierEntry->stDestIpAddress.ulIpv4Addr[uiIndex]);
+					bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+						"\tulDestIpMask:%lX\n",
+						pstClassifierEntry->stDestIpAddress.ulIpv4Mask[uiIndex]);
 				}
 			}
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tucProtocol:0x%X\n", pstClassifierEntry->ucProtocol[0]);
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tu8ClassifierRulePriority:%X\n", pstClassifierEntry->u8ClassifierRulePriority);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tucProtocol:0x%X\n",
+				pstClassifierEntry->ucProtocol[0]);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"\tu8ClassifierRulePriority:%X\n",
+				pstClassifierEntry->u8ClassifierRulePriority);
 		}
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "ulSFID:%lX\n", Adapter->PackInfo[uiLoopIndex].ulSFID);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "usVCID_Value:%X\n", Adapter->PackInfo[uiLoopIndex].usVCID_Value);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "PhsEnabled: 0x%X\n", Adapter->PackInfo[uiLoopIndex].bHeaderSuppressionEnabled);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiThreshold:%X\n", Adapter->PackInfo[uiLoopIndex].uiThreshold);
-
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "bValid:%X\n", Adapter->PackInfo[uiLoopIndex].bValid);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "bActive:%X\n", Adapter->PackInfo[uiLoopIndex].bActive);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "ActivateReqSent: %x", Adapter->PackInfo[uiLoopIndex].bActivateRequestSent);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "u8QueueType:%X\n", Adapter->PackInfo[uiLoopIndex].u8QueueType);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiMaxBucketSize:%X\n", Adapter->PackInfo[uiLoopIndex].uiMaxBucketSize);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiPerSFTxResourceCount:%X\n", atomic_read(&Adapter->PackInfo[uiLoopIndex].uiPerSFTxResourceCount));
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "ulSFID:%lX\n",
+			Adapter->PackInfo[uiLoopIndex].ulSFID);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "usVCID_Value:%X\n",
+			Adapter->PackInfo[uiLoopIndex].usVCID_Value);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "PhsEnabled: 0x%X\n",
+			Adapter->PackInfo[uiLoopIndex].bHeaderSuppressionEnabled);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiThreshold:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiThreshold);
+
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "bValid:%X\n",
+			Adapter->PackInfo[uiLoopIndex].bValid);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "bActive:%X\n",
+			Adapter->PackInfo[uiLoopIndex].bActive);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"ActivateReqSent: %x\n",
+			Adapter->PackInfo[uiLoopIndex].bActivateRequestSent);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "u8QueueType:%X\n",
+			Adapter->PackInfo[uiLoopIndex].u8QueueType);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiMaxBucketSize:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiMaxBucketSize);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"uiPerSFTxResourceCount:%X\n",
+			atomic_read(&Adapter->PackInfo[uiLoopIndex].uiPerSFTxResourceCount));
 		/* DumpDebug(DUMP_INFO,("bCSSupport:%X\n",Adapter->PackInfo[uiLoopIndex].bCSSupport)); */
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "CurrQueueDepthOnTarget: %x\n", Adapter->PackInfo[uiLoopIndex].uiCurrentQueueDepthOnTarget);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiCurrentBytesOnHost:%X\n", Adapter->PackInfo[uiLoopIndex].uiCurrentBytesOnHost);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiCurrentPacketsOnHost:%X\n", Adapter->PackInfo[uiLoopIndex].uiCurrentPacketsOnHost);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiDroppedCountBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiDroppedCountBytes);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiDroppedCountPackets:%X\n", Adapter->PackInfo[uiLoopIndex].uiDroppedCountPackets);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiSentBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiSentBytes);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiSentPackets:%X\n", Adapter->PackInfo[uiLoopIndex].uiSentPackets);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiCurrentDrainRate:%X\n", Adapter->PackInfo[uiLoopIndex].uiCurrentDrainRate);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiThisPeriodSentBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiThisPeriodSentBytes);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "liDrainCalculated:%llX\n", Adapter->PackInfo[uiLoopIndex].liDrainCalculated);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiCurrentTokenCount:%X\n", Adapter->PackInfo[uiLoopIndex].uiCurrentTokenCount);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "liLastUpdateTokenAt:%llX\n", Adapter->PackInfo[uiLoopIndex].liLastUpdateTokenAt);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiMaxAllowedRate:%X\n", Adapter->PackInfo[uiLoopIndex].uiMaxAllowedRate);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiPendedLast:%X\n", Adapter->PackInfo[uiLoopIndex].uiPendedLast);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "NumOfPacketsSent:%X\n", Adapter->PackInfo[uiLoopIndex].NumOfPacketsSent);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "Direction: %x\n", Adapter->PackInfo[uiLoopIndex].ucDirection);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "CID: %x\n", Adapter->PackInfo[uiLoopIndex].usCID);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "ProtocolValid: %x\n", Adapter->PackInfo[uiLoopIndex].bProtocolValid);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "TOSValid: %x\n", Adapter->PackInfo[uiLoopIndex].bTOSValid);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "DestIpValid: %x\n", Adapter->PackInfo[uiLoopIndex].bDestIpValid);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "SrcIpValid: %x\n", Adapter->PackInfo[uiLoopIndex].bSrcIpValid);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "ActiveSet: %x\n", Adapter->PackInfo[uiLoopIndex].bActiveSet);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "AdmittedSet: %x\n", Adapter->PackInfo[uiLoopIndex].bAdmittedSet);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "AuthzSet: %x\n", Adapter->PackInfo[uiLoopIndex].bAuthorizedSet);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "ClassifyPrority: %x\n", Adapter->PackInfo[uiLoopIndex].bClassifierPriority);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiMaxLatency: %x\n", Adapter->PackInfo[uiLoopIndex].uiMaxLatency);
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "ServiceClassName: %x %x %x %x\n", Adapter->PackInfo[uiLoopIndex].ucServiceClassName[0], Adapter->PackInfo[uiLoopIndex].ucServiceClassName[1], Adapter->PackInfo[uiLoopIndex].ucServiceClassName[2], Adapter->PackInfo[uiLoopIndex].ucServiceClassName[3]);
-/* BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "bHeaderSuppressionEnabled :%X\n", Adapter->PackInfo[uiLoopIndex].bHeaderSuppressionEnabled);
- * BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiTotalTxBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiTotalTxBytes);
- * BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "uiTotalRxBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiTotalRxBytes);
- *		DumpDebug(DUMP_INFO,("				uiRanOutOfResCount:%X\n",Adapter->PackInfo[uiLoopIndex].uiRanOutOfResCount));
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"CurrQueueDepthOnTarget: %x\n",
+			Adapter->PackInfo[uiLoopIndex].uiCurrentQueueDepthOnTarget);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"uiCurrentBytesOnHost:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiCurrentBytesOnHost);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"uiCurrentPacketsOnHost:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiCurrentPacketsOnHost);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"uiDroppedCountBytes:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiDroppedCountBytes);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"uiDroppedCountPackets:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiDroppedCountPackets);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiSentBytes:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiSentBytes);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiSentPackets:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiSentPackets);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"uiCurrentDrainRate:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiCurrentDrainRate);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"uiThisPeriodSentBytes:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiThisPeriodSentBytes);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"liDrainCalculated:%llX\n",
+			Adapter->PackInfo[uiLoopIndex].liDrainCalculated);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"uiCurrentTokenCount:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiCurrentTokenCount);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"liLastUpdateTokenAt:%llX\n",
+			Adapter->PackInfo[uiLoopIndex].liLastUpdateTokenAt);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"uiMaxAllowedRate:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiMaxAllowedRate);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiPendedLast:%X\n",
+			Adapter->PackInfo[uiLoopIndex].uiPendedLast);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"NumOfPacketsSent:%X\n",
+			Adapter->PackInfo[uiLoopIndex].NumOfPacketsSent);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "Direction: %x\n",
+			Adapter->PackInfo[uiLoopIndex].ucDirection);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "CID: %x\n",
+			Adapter->PackInfo[uiLoopIndex].usCID);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "ProtocolValid: %x\n",
+			Adapter->PackInfo[uiLoopIndex].bProtocolValid);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "TOSValid: %x\n",
+			Adapter->PackInfo[uiLoopIndex].bTOSValid);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "DestIpValid: %x\n",
+			Adapter->PackInfo[uiLoopIndex].bDestIpValid);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "SrcIpValid: %x\n",
+			Adapter->PackInfo[uiLoopIndex].bSrcIpValid);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "ActiveSet: %x\n",
+			Adapter->PackInfo[uiLoopIndex].bActiveSet);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "AdmittedSet: %x\n",
+			Adapter->PackInfo[uiLoopIndex].bAdmittedSet);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "AuthzSet: %x\n",
+			Adapter->PackInfo[uiLoopIndex].bAuthorizedSet);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"ClassifyPrority: %x\n",
+			Adapter->PackInfo[uiLoopIndex].bClassifierPriority);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiMaxLatency: %x\n",
+			Adapter->PackInfo[uiLoopIndex].uiMaxLatency);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"ServiceClassName: %x %x %x %x\n",
+			Adapter->PackInfo[uiLoopIndex].ucServiceClassName[0],
+			Adapter->PackInfo[uiLoopIndex].ucServiceClassName[1],
+			Adapter->PackInfo[uiLoopIndex].ucServiceClassName[2],
+			Adapter->PackInfo[uiLoopIndex].ucServiceClassName[3]);
+/* bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "bHeaderSuppressionEnabled :%X\n", Adapter->PackInfo[uiLoopIndex].bHeaderSuppressionEnabled);
+   * bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiTotalTxBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiTotalTxBytes);
+   * bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "uiTotalRxBytes:%X\n", Adapter->PackInfo[uiLoopIndex].uiTotalRxBytes);
+   *		DumpDebug(DUMP_INFO,("				uiRanOutOfResCount:%X\n",Adapter->PackInfo[uiLoopIndex].uiRanOutOfResCount));
  */
 	}
 
 	for (uiLoopIndex = 0; uiLoopIndex < MIBS_MAX_HIST_ENTRIES; uiLoopIndex++)
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "Adapter->aRxPktSizeHist[%x] = %x\n", uiLoopIndex, Adapter->aRxPktSizeHist[uiLoopIndex]);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"Adapter->aRxPktSizeHist[%x] = %x\n",
+			uiLoopIndex, Adapter->aRxPktSizeHist[uiLoopIndex]);
 
 	for (uiLoopIndex = 0; uiLoopIndex < MIBS_MAX_HIST_ENTRIES; uiLoopIndex++)
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "Adapter->aTxPktSizeHist[%x] = %x\n", uiLoopIndex, Adapter->aTxPktSizeHist[uiLoopIndex]);
+		bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+			"Adapter->aTxPktSizeHist[%x] = %x\n",
+			uiLoopIndex, Adapter->aTxPktSizeHist[uiLoopIndex]);
 
 	return;
 }
@@ -942,7 +1104,8 @@ int run_card_proc(PMINI_ADAPTER ps_adapter)
 		bytes = rdmalt(ps_adapter, CLOCK_RESET_CNTRL_REG_1, &value, sizeof(value));
 		if (bytes < 0) {
 			status = bytes;
-			BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "%s:%d\n", __func__, __LINE__);
+			bcm_dbg(ps_adapter, INITEXIT, MP_INIT, ALL,
+				"%s:%d\n", __func__, __LINE__);
 			return status;
 		}
 
@@ -952,7 +1115,8 @@ int run_card_proc(PMINI_ADAPTER ps_adapter)
 			value |= (1<<30);
 
 		if (wrmalt(ps_adapter, CLOCK_RESET_CNTRL_REG_1, &value, sizeof(value)) < 0) {
-			BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "%s:%d\n", __func__, __LINE__);
+			bcm_dbg(ps_adapter, INITEXIT, MP_INIT, ALL,
+				"%s:%d\n", __func__, __LINE__);
 			return STATUS_FAILURE;
 		}
 	}
@@ -999,21 +1163,25 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
 				sizeof(STARGETPARAMS),
 				CONFIG_BEGIN_ADDR);
 	if (status) {
-		BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Error downloading CFG file");
+		bcm_dbg(ps_adapter, INITEXIT, MP_INIT, ALL,
+			"Error downloading CFG file\n");
 		goto OUT;
 	}
 
 	if (register_networkdev(ps_adapter)) {
-		BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Register Netdevice failed. Cleanup needs to be performed.");
+		bcm_dbg(ps_adapter, INITEXIT, MP_INIT, ALL,
+			"Register Netdevice failed. Cleanup needs to be performed.\n");
 		return -EIO;
 	}
 
 	if (FALSE == ps_adapter->AutoFirmDld) {
-		BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "AutoFirmDld Disabled in CFG File..\n");
+		bcm_dbg(ps_adapter, INITEXIT, MP_INIT, ALL,
+			"AutoFirmDld Disabled in CFG File..\n");
 		/* If Auto f/w download is disable, register the control interface, */
 		/* register the control interface after the mailbox. */
 		if (register_control_device_interface(ps_adapter) < 0) {
-			BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Register Control Device failed. Cleanup needs to be performed.");
+			bcm_dbg(ps_adapter, INITEXIT, MP_INIT, ALL,
+				"Register Control Device failed. Cleanup needs to be performed.\n");
 			return -EIO;
 		}
 		return STATUS_SUCCESS;
@@ -1053,7 +1221,8 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
 	if (ps_adapter->eNVMType == NVM_FLASH) {
 		status = PropagateCalParamsFromFlashToMemory(ps_adapter);
 		if (status) {
-			BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Propagation of Cal param failed ..");
+			bcm_dbg(ps_adapter, INITEXIT, MP_INIT, ALL,
+				"Propagation of Cal param failed ..\n");
 			goto OUT;
 		}
 	}
@@ -1061,13 +1230,15 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
 	/* Download Firmare */
 	status = BcmFileDownload(ps_adapter, BIN_FILE, FIRMWARE_BEGIN_ADDR);
 	if (status != 0) {
-		BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "No Firmware File is present...\n");
+		bcm_dbg(ps_adapter, INITEXIT, MP_INIT, ALL,
+			"No Firmware File is present...\n");
 		goto OUT;
 	}
 
 	status = run_card_proc(ps_adapter);
 	if (status) {
-		BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "run_card_proc Failed\n");
+		bcm_dbg(ps_adapter, INITEXIT, MP_INIT, ALL,
+			"run_card_proc Failed\n");
 		goto OUT;
 	}
 
@@ -1103,7 +1274,8 @@ static int bcm_parse_target_params(PMINI_ADAPTER Adapter)
 
 	flp = open_firmware_file(Adapter, CFG_FILE);
 	if (!flp) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "NOT ABLE TO OPEN THE %s FILE\n", CFG_FILE);
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"NOT ABLE TO OPEN THE %s FILE\n", CFG_FILE);
 		kfree(buff);
 		kfree(Adapter->pstargetparams);
 		Adapter->pstargetparams = NULL;
@@ -1115,7 +1287,8 @@ static int bcm_parse_target_params(PMINI_ADAPTER Adapter)
 	set_fs(oldfs);
 
 	if (len != sizeof(STARGETPARAMS)) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Mismatch in Target Param Structure!\n");
+		bcm_dbg(Adapter, INITEXIT, MP_INIT, ALL,
+			"Mismatch in Target Param Structure!\n");
 		kfree(buff);
 		kfree(Adapter->pstargetparams);
 		Adapter->pstargetparams = NULL;
@@ -1200,7 +1373,8 @@ static VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
 	psAdapter->bIsAutoCorrectEnabled = !((char)(psAdapter->ulPowerSaveMode >> 3) & 0x1);
 
 	if (reporting_mode == TRUE) {
-		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "can't do suspen/resume as reporting mode is enable");
+		bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL,
+			"can't do suspen/resume as reporting mode is enable\n");
 		psAdapter->bDoSuspend = FALSE;
 	}
 
@@ -1219,7 +1393,9 @@ static VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
 		/* remove the autocorrect disable bit set before dumping. */
 		psAdapter->ulPowerSaveMode &= ~(1 << 3);
 		psAdapter->pstargetparams->HostDrvrConfig6 &= ~(htonl(1 << 15));
-		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Using Forced User Choice: %lx\n", psAdapter->ulPowerSaveMode);
+		bcm_dbg(psAdapter, INITEXIT, MP_INIT, ALL,
+			"Using Forced User Choice: %lx\n",
+			psAdapter->ulPowerSaveMode);
 	}
 }
 
@@ -1255,7 +1431,8 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)
 			goto OUT;
 		}
 		pucmacaddr[i] = temp & 0xff;
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "%x\n", pucmacaddr[i]);
+		bcm_dbg(Adapter, INITEXIT, DRV_ENTRY, ALL,
+			"%x\n", pucmacaddr[i]);
 	}
 OUT:
 	return pucmacaddr;
@@ -1370,12 +1547,15 @@ exit:
 static VOID HandleShutDownModeWakeup(PMINI_ADAPTER Adapter)
 {
 	int clear_abort_pattern = 0, Status = 0;
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "====>\n");
+	bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL, "====>\n");
 	/* target has woken up From Shut Down */
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "Clearing Shut Down Software abort pattern\n");
+	bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL,
+		"Clearing Shut Down Software abort pattern\n");
 	Status = wrmalt(Adapter, SW_ABORT_IDLEMODE_LOC, (PUINT)&clear_abort_pattern, sizeof(clear_abort_pattern));
 	if (Status) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "WRM to SW_ABORT_IDLEMODE_LOC failed with err:%d", Status);
+		bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL,
+			"WRM to SW_ABORT_IDLEMODE_LOC failed with err:%d\n",
+			Status);
 		return;
 	}
 
@@ -1393,7 +1573,7 @@ static VOID HandleShutDownModeWakeup(PMINI_ADAPTER Adapter)
 	Adapter->bTriedToWakeUpFromlowPowerMode = FALSE;
 	Adapter->bShutStatus = FALSE;
 	wake_up(&Adapter->lowpower_mode_wait_queue);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "<====\n");
+	bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL, "<====\n");
 }
 
 static VOID SendShutModeResponse(PMINI_ADAPTER Adapter)
@@ -1427,11 +1607,13 @@ static VOID SendShutModeResponse(PMINI_ADAPTER Adapter)
 		if (!lowPwrAbortMsg)
 			up(&Adapter->LowPowerModeSync);
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "Device Access is going on NACK the Shut Down MODE\n");
+		bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL,
+			"Device Access is going on NACK the Shut Down MODE\n");
 		stShutdownResponse.szData[2] = SHUTDOWN_NACK_FROM_DRIVER; /* NACK- device access is going on. */
 		Adapter->bPreparingForLowPowerMode = FALSE;
 	} else {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "Sending SHUTDOWN MODE ACK\n");
+		bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL,
+			"Sending SHUTDOWN MODE ACK\n");
 		stShutdownResponse.szData[2] = SHUTDOWN_ACK_FROM_DRIVER; /* ShutDown ACK */
 
 		/* Wait for the LED to TURN OFF before sending ACK response */
@@ -1454,7 +1636,8 @@ static VOID SendShutModeResponse(PMINI_ADAPTER Adapter)
 		}
 
 		if (stShutdownResponse.szData[2] == SHUTDOWN_ACK_FROM_DRIVER) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "ACKING SHUTDOWN MODE !!!!!!!!!");
+			bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL,
+				"ACKING SHUTDOWN MODE !!!!!!!!!\n");
 			down(&Adapter->rdmwrmsync);
 			Adapter->bPreparingForLowPowerMode = TRUE;
 			up(&Adapter->rdmwrmsync);
@@ -1474,7 +1657,8 @@ static VOID SendShutModeResponse(PMINI_ADAPTER Adapter)
 
 	Status = CopyBufferToControlPacket(Adapter, &stShutdownResponse);
 	if ((Status != STATUS_SUCCESS)) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "fail to send the Idle mode Request\n");
+		bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL,
+			"fail to send the Idle mode Request\n");
 		Adapter->bPreparingForLowPowerMode = FALSE;
 		StartInterruptUrb((PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter));
 	}
@@ -1484,7 +1668,7 @@ static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
 {
 	B_UINT32 uiResetValue = 0;
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "====>\n");
+	bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL, "====>\n");
 
 	if (*(pucBuffer+1) ==  COMPLETE_WAKE_UP_NOTIFICATION_FRM_FW) {
 		HandleShutDownModeWakeup(Adapter);
@@ -1502,10 +1686,11 @@ static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
 		}
 
 		SendShutModeResponse(Adapter);
-		BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "ShutDownModeResponse:Notification received: Sending the response(Ack/Nack)\n");
+		bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL,
+			"ShutDownModeResponse:Notification received: Sending the response(Ack/Nack)\n");
 	}
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "<====\n");
+	bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL, "<====\n");
 	return;
 }
 
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 34eb5ab..7240d60 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -98,7 +98,7 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 	struct sk_buff *newPacket = NULL;
 	struct sk_buff *Packet = *pPacket;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL, "In PHSTransmit");
+	bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL, "In PHSTransmit\n");
 
 	if(!bEthCSSupport)
 		BytesToRemove=ETH_HLEN;
@@ -133,7 +133,9 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 			(usPacketType == ETHERNET_FRAMETYPE_IPV6)) &&
 			(bHeaderSuppressionEnabled))
 		{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nTrying to PHS Compress Using Classifier rule 0x%X",uiClassifierRuleID);
+			bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+				"Trying to PHS Compress Using Classifier rule 0x%X\n",
+				uiClassifierRuleID);
 
 
 				unPHSNewPktHeaderLen = unPHSPktHdrBytesCopied;
@@ -144,7 +146,9 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 					pucPHSPktHdrOutBuf,
 					&unPhsOldHdrSize,
 					&unPHSNewPktHeaderLen);
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nPHS Old header Size : %d New Header Size  %d\n",unPhsOldHdrSize,unPHSNewPktHeaderLen);
+				bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+					"PHS Old header Size : %d New Header Size  %d\n",
+					unPhsOldHdrSize, unPHSNewPktHeaderLen);
 
 				if(unPHSNewPktHeaderLen == unPhsOldHdrSize)
 				{
@@ -155,7 +159,8 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 
 				if(  ulPhsStatus == STATUS_PHS_COMPRESSED)
 				{
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"PHS Sending packet Compressed");
+					bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+						"PHS Sending packet Compressed\n");
 
 					if(skb_cloned(Packet))
 					{
@@ -200,14 +205,15 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 		{
 			if(!bHeaderSuppressionEnabled)
 			{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nHeader Suppression Disabled For SF: No PHS\n");
+				bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+					"Header Suppression Disabled For SF: No PHS\n");
 			}
 
 			return STATUS_SUCCESS;
 		}
 	}
 
-	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"PHSTransmit : Dumping data packet After PHS");
+	//bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL, "PHSTransmit : Dumping data packet After PHS\n");
 	return STATUS_SUCCESS;
 }
 
@@ -225,7 +231,8 @@ int PHSReceive(PMINI_ADAPTER Adapter,
 	UINT TotalBytesAdded = 0;
 	if(!bHeaderSuppressionEnabled)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nPhs Disabled for incoming packet");
+		bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
+			"Phs Disabled for incoming packet\n");
 		return ulPhsStatus;
 	}
 
@@ -240,8 +247,9 @@ int PHSReceive(PMINI_ADAPTER Adapter,
 		&nTotalsupressedPktHdrBytes,
 		&nStandardPktHdrLen);
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nSupressed PktHdrLen : 0x%x Restored PktHdrLen : 0x%x",
-					nTotalsupressedPktHdrBytes,nStandardPktHdrLen);
+	bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
+		"Supressed PktHdrLen : 0x%x Restored PktHdrLen : 0x%x\n",
+		nTotalsupressedPktHdrBytes,nStandardPktHdrLen);
 
 	if(ulPhsStatus != STATUS_PHS_COMPRESSED)
 	{
@@ -276,7 +284,7 @@ int PHSReceive(PMINI_ADAPTER Adapter,
 void DumpFullPacket(UCHAR *pBuf,UINT nPktLen)
 {
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,"Dumping Data Packet");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Dumping Data Packet\n");
     BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,pBuf,nPktLen);
 }
 
@@ -297,7 +305,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
 {
 	int i;
 	S_SERVICEFLOW_TABLE *pstServiceFlowTable;
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nPHS:phs_init function ");
+	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "PHS:phs_init function\n");
 
 	if(pPhsdeviceExtension->pstServiceFlowPhsRulesTable)
 		return -EINVAL;
@@ -307,7 +315,8 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
 
     if(!pPhsdeviceExtension->pstServiceFlowPhsRulesTable)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation ServiceFlowPhsRulesTable failed");
+		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+			"Allocation ServiceFlowPhsRulesTable failed\n");
 		return -ENOMEM;
 	}
 
@@ -318,7 +327,8 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
 		sServiceFlow.pstClassifierTable = kzalloc(sizeof(S_CLASSIFIER_TABLE), GFP_KERNEL);
 		if(!sServiceFlow.pstClassifierTable)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed");
+			bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+				"Allocation failed\n");
 			free_phs_serviceflow_rules(pPhsdeviceExtension->
                 pstServiceFlowPhsRulesTable);
 			pPhsdeviceExtension->pstServiceFlowPhsRulesTable = NULL;
@@ -330,7 +340,8 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
 
     if(pPhsdeviceExtension->CompressedTxBuffer == NULL)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed");
+		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+			"Allocation failed\n");
 		free_phs_serviceflow_rules(pPhsdeviceExtension->pstServiceFlowPhsRulesTable);
 		pPhsdeviceExtension->pstServiceFlowPhsRulesTable = NULL;
 		return -ENOMEM;
@@ -339,7 +350,8 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
     pPhsdeviceExtension->UnCompressedRxBuffer = kmalloc(PHS_BUFFER_SIZE, GFP_KERNEL);
 	if(pPhsdeviceExtension->UnCompressedRxBuffer == NULL)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed");
+		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+			"Allocation failed\n");
 		kfree(pPhsdeviceExtension->CompressedTxBuffer);
 		free_phs_serviceflow_rules(pPhsdeviceExtension->pstServiceFlowPhsRulesTable);
 		pPhsdeviceExtension->pstServiceFlowPhsRulesTable = NULL;
@@ -348,7 +360,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
 
 
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\n phs_init Successfull");
+	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "phs_init Successfull\n");
 	return STATUS_SUCCESS;
 }
 
@@ -406,11 +418,13 @@ ULONG PhsUpdateClassifierRule(IN void* pvContext,
 
 	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"PHS With Corr2 Changes \n");
+	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+		"PHS With Corr2 Changes\n");
 
 	if(pDeviceExtension == NULL)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"Invalid Device Extension\n");
+		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+			"Invalid Device Extension\n");
 		return ERR_PHS_INVALID_DEVICE_EXETENSION;
 	}
 
@@ -469,7 +483,7 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
 
 	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "======>\n");
+	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "======>\n");
 
 	if(pDeviceExtension)
 	{
@@ -480,7 +494,8 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
 
        if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "SFID Match Failed\n");
+			bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+				"SFID Match Failed\n");
 			return ERR_SF_MATCH_FAIL;
 		}
 
@@ -540,7 +555,8 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
 		      ->pstServiceFlowPhsRulesTable, uiVcid, &pstServiceFlowEntry);
 		if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"SFID Match Failed\n");
+			bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+				"SFID Match Failed\n");
 			return ERR_SF_MATCH_FAIL;
 		}
 
@@ -596,7 +612,7 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
 	S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"====> \n");
+	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "====>\n");
 
 	if(pDeviceExtension)
 	{
@@ -605,7 +621,8 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
 		                  uiVcid,&pstServiceFlowEntry);
 		if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "SFID Match Failed\n");
+			bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+				"SFID Match Failed\n");
 			return ERR_SF_MATCH_FAIL;
 		}
 
@@ -695,13 +712,14 @@ ULONG PhsCompress(IN void* pvContext,
 
 	if(pDeviceExtension == NULL)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"Invalid Device Extension\n");
+		bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+			"Invalid Device Extension\n");
 		lStatus =  STATUS_PHS_NOCOMPRESSION ;
 		return lStatus;
 
 	}
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"Suppressing header \n");
+	bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL, "Suppressing header\n");
 
 
 	//Retrieve the SFID Entry Index for requested Service Flow
@@ -709,7 +727,7 @@ ULONG PhsCompress(IN void* pvContext,
 	                  uiVcid,&pstServiceFlowEntry);
 	if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"SFID Match Failed\n");
+		bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL, "SFID Match Failed\n");
 		lStatus =  STATUS_PHS_NOCOMPRESSION ;
 		return lStatus;
 	}
@@ -719,7 +737,8 @@ ULONG PhsCompress(IN void* pvContext,
 
     if(nClsidIndex == PHS_INVALID_TABLE_INDEX)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"No PHS Rule Defined For Classifier\n");
+		bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+			"No PHS Rule Defined For Classifier\n");
 		lStatus =  STATUS_PHS_NOCOMPRESSION ;
 		return lStatus;
 	}
@@ -730,7 +749,8 @@ ULONG PhsCompress(IN void* pvContext,
 
 	if(!ValidatePHSRuleComplete(pstPhsRule))
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"PHS Rule Defined For Classifier But Not Complete\n");
+		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+			"PHS Rule Defined For Classifier But Not Complete\n");
 		lStatus =  STATUS_PHS_NOCOMPRESSION ;
 		return lStatus;
 	}
@@ -788,14 +808,16 @@ ULONG PhsDeCompress(IN void* pvContext,
 
 	if(pDeviceExtension == NULL)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"Invalid Device Extension\n");
+		bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
+			"Invalid Device Extension\n");
 		return ERR_PHS_INVALID_DEVICE_EXETENSION;
 	}
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"Restoring header\n");
+	bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL, "Restoring header\n");
 
 	phsi = *((unsigned char *)(pvInputBuffer));
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"PHSI To Be Used For restore : %x\n",phsi);
+	bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
+		"PHSI To Be Used For restore : %x\n", phsi);
     if(phsi == UNCOMPRESSED_PACKET )
 	{
 		return STATUS_PHS_NOCOMPRESSION;
@@ -806,7 +828,8 @@ ULONG PhsDeCompress(IN void* pvContext,
 	      uiVcid,&pstServiceFlowEntry);
 	if(nSFIndex == PHS_INVALID_TABLE_INDEX)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"SFID Match Failed During Lookup\n");
+		bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
+			"SFID Match Failed During Lookup\n");
 		return ERR_SF_MATCH_FAIL;
 	}
 
@@ -851,7 +874,7 @@ static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTa
 	int i,j;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "=======>\n");
+	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "=======>\n");
     if(psServiceFlowRulesTable)
 	{
 		for(i=0;i<MAX_SERVICEFLOWS;i++)
@@ -1062,7 +1085,7 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
     psaClassifiertable = pstServiceFlowEntry->pstClassifierTable;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "==>");
+	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "==>\n");
 
 	/* Check if the supplied Classifier already exists */
 	nClassifierIndex =GetClassifierEntry(
@@ -1151,7 +1174,8 @@ static UINT CreateClassifierPHSRule(IN B_UINT16  uiClsId,
 	S_CLASSIFIER_ENTRY *psClassifierRules = NULL;
 	UINT nStatus = PHS_SUCCESS;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"Inside CreateClassifierPHSRule");
+	bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+		"Inside CreateClassifierPHSRule\n");
     if(psaClassifiertable == NULL)
 	{
 		return ERR_INVALID_CLASSIFIERTABLE_FOR_SF;
@@ -1273,11 +1297,13 @@ static UINT UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
 	    eActiveClassifierRuleContext, &pstAddPhsRule);
 	if(PHS_INVALID_TABLE_INDEX == nPhsRuleIndex)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAdding New PHSRuleEntry For Classifier");
+		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+			"Adding New PHSRuleEntry For Classifier\n");
 
 		if(psPhsRule->u8PHSI == 0)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nError PHSI is Zero\n");
+			bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+				"Error PHSI is Zero\n");
 			return ERR_PHS_INVALID_PHS_RULE;
 		}
 		//Step 2.a PHS Rule Does Not Exist .Create New PHS Rule for uiClsId
@@ -1295,7 +1321,8 @@ static UINT UpdateClassifierPHSRule(IN B_UINT16  uiClsId,
 	else
 	{
 		//Step 2.b PHS Rule  Exists Tie uiClsId with the existing PHS Rule
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nTying Classifier to Existing PHS Rule");
+		bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL,
+			"Tying Classifier to Existing PHS Rule\n");
 		if(bPHSRuleOrphaned)
 		{
 			kfree(pstClassifierEntry->pstPhsRule);
@@ -1337,7 +1364,7 @@ void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension)
 {
 	int i,j,k,l;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\n Dumping PHS Rules : \n");
+	bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "Dumping PHS Rules :\n");
 	for(i=0;i<MAX_SERVICEFLOWS;i++)
 	{
 		S_SERVICEFLOW_ENTRY stServFlowEntry =
@@ -1353,37 +1380,63 @@ void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension)
 					{
 						stClsEntry = stServFlowEntry.pstClassifierTable->stActivePhsRulesList[j];
 						if(stClsEntry.bUsed)
-							BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n Active PHS Rule : \n");
+							bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+								"Active PHS Rule :\n");
 					}
 					else
 					{
 						stClsEntry = stServFlowEntry.pstClassifierTable->stOldPhsRulesList[j];
 						if(stClsEntry.bUsed)
-							BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n Old PHS Rule : \n");
+							bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+								"Old PHS Rule :\n");
 					}
 					if(stClsEntry.bUsed)
 					{
 
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\n VCID  : %#X",stServFlowEntry.uiVcid);
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n ClassifierID  : %#X",stClsEntry.uiClassifierRuleId);
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n PHSRuleID  : %#X",stClsEntry.u8PHSI);
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n****************PHS Rule********************\n");
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n PHSI  : %#X",stClsEntry.pstPhsRule->u8PHSI);
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n PHSFLength : %#X ",stClsEntry.pstPhsRule->u8PHSFLength);
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n PHSF : ");
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"VCID  : %#X\n",
+							stServFlowEntry.uiVcid);
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"ClassifierID  : %#X\n",
+							stClsEntry.uiClassifierRuleId);
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"PHSRuleID  : %#X\n",
+							stClsEntry.u8PHSI);
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"****************PHS Rule********************\n");
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"PHSI  : %#X\n",
+							stClsEntry.pstPhsRule->u8PHSI);
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"PHSFLength : %#X\n",
+							stClsEntry.pstPhsRule->u8PHSFLength);
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"PHSF :\n");
 						for(k=0;k<stClsEntry.pstPhsRule->u8PHSFLength;k++)
 						{
-							BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "%#X  ",stClsEntry.pstPhsRule->u8PHSF[k]);
+							bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+								"%#X\n",
+								stClsEntry.pstPhsRule->u8PHSF[k]);
 						}
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n PHSMLength  : %#X",stClsEntry.pstPhsRule->u8PHSMLength);
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n PHSM :");
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"PHSMLength  : %#X\n",
+							stClsEntry.pstPhsRule->u8PHSMLength);
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"PHSM :\n");
 						for(k=0;k<stClsEntry.pstPhsRule->u8PHSMLength;k++)
 						{
-							BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "%#X  ",stClsEntry.pstPhsRule->u8PHSM[k]);
+							bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+								"%#X\n",
+								stClsEntry.pstPhsRule->u8PHSM[k]);
 						}
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n PHSS : %#X ",stClsEntry.pstPhsRule->u8PHSS);
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, (DBG_LVL_ALL|DBG_NO_FUNC_PRINT), "\n PHSV  : %#X",stClsEntry.pstPhsRule->u8PHSV);
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\n********************************************\n");
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"PHSS : %#X\n",
+							stClsEntry.pstPhsRule->u8PHSS);
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"PHSV  : %#X\n",
+							stClsEntry.pstPhsRule->u8PHSV);
+						bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+							"********************************************\n");
 					}
 				}
 			}
@@ -1419,7 +1472,7 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,
 	int in_buf_len = *header_size-1;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	in_buf++;
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"====>\n");
+	bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL, "====>\n");
 	*header_size = 0;
 
 	if((decomp_phs_rules == NULL ))
@@ -1427,7 +1480,8 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,
 
 
 	tmp_memb = decomp_phs_rules;
-	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nDECOMP:In phs_decompress PHSI 1  %d",phsi));
+	//bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
+	//"DECOMP:In phs_decompress PHSI 1  %d\n",phsi));
 	//*header_size = tmp_memb->u8PHSFLength;
 	phss         = tmp_memb->u8PHSS;
 	phsf         = tmp_memb->u8PHSF;
@@ -1435,7 +1489,8 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,
 
 	if(phss > MAX_PHS_LENGTHS)
 		phss = MAX_PHS_LENGTHS;
-	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nDECOMP:In phs_decompress PHSI  %d phss %d index %d",phsi,phss,index));
+	//bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
+	//"\nDECOMP:In phs_decompress PHSI  %d phss %d index %d\n", phsi,phss,index));
 	while((phss > 0) && (size < in_buf_len))
 	{
 		bit =  ((*phsm << i)& SUPPRESS);
@@ -1443,14 +1498,16 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,
 		if(bit == SUPPRESS)
 		{
 			*out_buf = *phsf;
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nDECOMP:In phss  %d phsf %d ouput %d",
-              phss,*phsf,*out_buf);
+			bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
+				"DECOMP:In phss  %d phsf %d ouput %d\n",
+				phss, *phsf, *out_buf);
 		}
 		else
 		{
 			*out_buf = *in_buf;
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nDECOMP:In phss  %d input %d ouput %d",
-            phss,*in_buf,*out_buf);
+			bcm_dbg(Adapter, OTHERS, PHS_RECEIVE, ALL,
+				"DECOMP:In phss  %d input %d ouput %d\n",
+				phss, *in_buf, *out_buf);
 			in_buf++;
 			size++;
 		}
@@ -1500,7 +1557,8 @@ static int phs_compress(S_PHS_RULE  *phs_rule,unsigned char *in_buf
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
     if(phs_rule == NULL)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nphs_compress(): phs_rule null!");
+		bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+			"phs_compress(): phs_rule null!\n");
 		*out_buf = ZERO_PHSI;
 		return STATUS_PHS_NOCOMPRESSION;
 	}
@@ -1522,12 +1580,14 @@ static int phs_compress(S_PHS_RULE  *phs_rule,unsigned char *in_buf
 	if(supress == STATUS_PHS_COMPRESSED)
 	{
 		*old_addr = (unsigned char)phs_rule->u8PHSI;
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In phs_compress phsi %d",phs_rule->u8PHSI);
+		bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+			"COMP:In phs_compress phsi %d\n", phs_rule->u8PHSI);
 	}
 	else
 	{
 		*old_addr = ZERO_PHSI;
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In phs_compress PHSV Verification failed");
+		bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+			"COMP:In phs_compress PHSV Verification failed\n");
 	}
 	return supress;
 }
@@ -1560,7 +1620,8 @@ static int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buff
 	unsigned int size=0;
 	int bit,i=0;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In verify_phsf PHSM - 0x%X",*phsm);
+	bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+		"COMP:In verify_phsf PHSM - 0x%X\n", *phsm);
 
 
 	if(phss>(*new_header_size))
@@ -1577,17 +1638,23 @@ static int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buff
 			{
 				if(phsv == VERIFY)
 				{
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In verify_phsf failed for field  %d buf  %d phsf %d",phss,*in_buffer,*phsf);
+					bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+						"COMP:In verify_phsf failed for field  %d buf  %d phsf %d\n",
+						phss, *in_buffer, *phsf);
 					return STATUS_PHS_NOCOMPRESSION;
 				}
 			}
 			else
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In verify_phsf success for field  %d buf  %d phsf %d",phss,*in_buffer,*phsf);
+				bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+					"COMP:In verify_phsf success for field  %d buf  %d phsf %d\n",
+					phss, *in_buffer, *phsf);
 		}
 		else
 		{
 			*out_buffer = *in_buffer;
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In copying_header input %d  out %d",*in_buffer,*out_buffer);
+			bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+				"COMP:In copying_header input %d  out %d\n",
+				*in_buffer, *out_buffer);
 			out_buffer++;
 			size++;
 		}
@@ -1601,7 +1668,8 @@ static int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buff
 			phsm++;
 		}
 	}
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In verify_phsf success");
+	bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL,
+		"COMP:In verify_phsf success\n");
 	*new_header_size = size;
 	return STATUS_PHS_COMPRESSED;
 }
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index c97020f..fef5945 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -35,14 +35,18 @@ BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP)
        	return TRUE;
     for(ucLoopIndex=0; ucLoopIndex < (pstClassifierRule->ucIPSourceAddressLength);ucLoopIndex++)
     {
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Src Ip Address Mask:0x%x PacketIp:0x%x and Classification:0x%x", (UINT)pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex], (UINT)ulSrcIP, (UINT)pstClassifierRule->stSrcIpAddress.ulIpv6Addr[ucLoopIndex]);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"Src Ip Address Mask:0x%x PacketIp:0x%x and Classification:0x%x\n",
+			(UINT)pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex],
+			(UINT)ulSrcIP,
+			(UINT)pstClassifierRule->stSrcIpAddress.ulIpv6Addr[ucLoopIndex]);
 		if((pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex] & ulSrcIP)==
 				(pstClassifierRule->stSrcIpAddress.ulIpv4Addr[ucLoopIndex] & pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex] ))
        	{
        		return TRUE;
        	}
     }
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Src Ip Address Not Matched");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Src Ip Address Not Matched\n");
    	return FALSE;
 }
 
@@ -66,7 +70,11 @@ BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP)
 	ulDestIP=ntohl(ulDestIP);
     if(0 == pstClassifierRule->ucIPDestinationAddressLength)
        	return TRUE;
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Destination Ip Address 0x%x 0x%x 0x%x  ", (UINT)ulDestIP, (UINT)pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex], (UINT)pstClassifierRule->stDestIpAddress.ulIpv4Addr[ucLoopIndex]);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"Destination Ip Address 0x%x 0x%x 0x%x\n",
+		(UINT)ulDestIP,
+		(UINT)pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex],
+		(UINT)pstClassifierRule->stDestIpAddress.ulIpv4Addr[ucLoopIndex]);
 
     for(ucLoopIndex=0;ucLoopIndex<(pstClassifierRule->ucIPDestinationAddressLength);ucLoopIndex++)
     {
@@ -76,7 +84,8 @@ BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP)
        		return TRUE;
        	}
     }
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Destination Ip Address Not Matched");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"Destination Ip Address Not Matched\n");
     return FALSE;
 }
 
@@ -102,7 +111,7 @@ BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucTypeOfService)
     {
        	return TRUE;
     }
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Type Of Service Not Matched");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Type Of Service Not Matched\n");
     return FALSE;
 }
 
@@ -125,13 +134,15 @@ BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol)
       	return TRUE;
 	for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucProtocolLength;ucLoopIndex++)
     {
-       	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Protocol:0x%X Classification Protocol:0x%X",ucProtocol,pstClassifierRule->ucProtocol[ucLoopIndex]);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"Protocol:0x%X Classification Protocol:0x%X\n",
+			ucProtocol, pstClassifierRule->ucProtocol[ucLoopIndex]);
        	if(pstClassifierRule->ucProtocol[ucLoopIndex]==ucProtocol)
        	{
        		return TRUE;
        	}
     }
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Protocol Not Matched");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Protocol Not Matched\n");
    	return FALSE;
 }
 
@@ -163,7 +174,8 @@ BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort)
 		    	return TRUE;
 	    	}
     	}
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Src Port: %x Not Matched ",ushSrcPort);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"Src Port: %x Not Matched\n", ushSrcPort);
     	return FALSE;
 }
 
@@ -188,7 +200,11 @@ BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort)
 
     	for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucDestPortRangeLength;ucLoopIndex++)
     	{
-        	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Matching Port:0x%X   0x%X  0x%X",ushDestPort,pstClassifierRule->usDestPortRangeLo[ucLoopIndex],pstClassifierRule->usDestPortRangeHi[ucLoopIndex]);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"Matching Port:0x%X   0x%X  0x%X\n",
+			ushDestPort,
+			pstClassifierRule->usDestPortRangeLo[ucLoopIndex],
+			pstClassifierRule->usDestPortRangeHi[ucLoopIndex]);
 
  		if(ushDestPort <= pstClassifierRule->usDestPortRangeHi[ucLoopIndex] &&
 		    ushDestPort >= pstClassifierRule->usDestPortRangeLo[ucLoopIndex])
@@ -196,7 +212,8 @@ BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort)
 		    return TRUE;
 	    	}
     	}
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Dest Port: %x Not Matched",ushDestPort);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"Dest Port: %x Not Matched\n", ushDestPort);
     	return FALSE;
 }
 /**
@@ -211,12 +228,13 @@ static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 	xporthdr     		*xprt_hdr=NULL;
 	BOOLEAN	bClassificationSucceed=FALSE;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "========>");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "========>\n");
 
 	xprt_hdr=(xporthdr *)((PUCHAR)iphd + sizeof(struct iphdr));
 
 	do {
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Trying to see Direction = %d %d",
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"Trying to see Direction = %d %d\n",
 			pstClassifierRule->ucDirection,
 			pstClassifierRule->usVCID_Value);
 
@@ -227,40 +245,44 @@ static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 			break;
 		}
 
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "is IPv6 check!");
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "is IPv6 check!\n");
 		if(pstClassifierRule->bIpv6Protocol)
 			break;
 
 		//**************Checking IP header parameter**************************//
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Trying to match Source IP Address");
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"Trying to match Source IP Address\n");
 		if(FALSE == (bClassificationSucceed =
 			MatchSrcIpAddress(pstClassifierRule, iphd->saddr)))
 			break;
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Source IP Address Matched");
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"Source IP Address Matched\n");
 
 		if(FALSE == (bClassificationSucceed =
 			MatchDestIpAddress(pstClassifierRule, iphd->daddr)))
 			break;
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Destination IP Address Matched");
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"Destination IP Address Matched\n");
 
 		if(FALSE == (bClassificationSucceed =
 			MatchTos(pstClassifierRule, iphd->tos)))
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "TOS Match failed\n");
+			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+				"TOS Match failed\n");
 			break;
 		}
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "TOS Matched");
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "TOS Matched\n");
 
 		if(FALSE == (bClassificationSucceed =
 			MatchProtocol(pstClassifierRule,iphd->protocol)))
 			break;
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Protocol Matched");
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Protocol Matched\n");
 
 		//if protocol is not TCP or UDP then no need of comparing source port and destination port
 		if(iphd->protocol!=TCP && iphd->protocol!=UDP)
 			break;
 		//******************Checking Transport Layer Header field if present *****************//
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Source Port %04x",
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Source Port %04x\n",
 			(iphd->protocol==UDP)?xprt_hdr->uhdr.source:xprt_hdr->thdr.source);
 
 		if(FALSE == (bClassificationSucceed =
@@ -268,9 +290,9 @@ static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 				ntohs((iphd->protocol == UDP)?
 				xprt_hdr->uhdr.source:xprt_hdr->thdr.source))))
 			break;
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Src Port Matched");
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Src Port Matched\n");
 
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Destination Port %04x",
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Destination Port %04x\n",
 			(iphd->protocol==UDP)?xprt_hdr->uhdr.dest:
 			xprt_hdr->thdr.dest);
 		if(FALSE == (bClassificationSucceed =
@@ -297,7 +319,7 @@ static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 		}
 	}
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "IpVersion4 <==========");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "IpVersion4 <==========\n");
 
 	return bClassificationSucceed;
 }
@@ -328,7 +350,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 	struct sk_buff* PacketToDrop=NULL;
 	struct net_device_stats *netstats;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "=====> Index %d",iIndex);
+	bcm_dbg(Adapter, TX, PRUNE_QUEUE, ALL, "=====> Index %d\n", iIndex);
 
    	if(iIndex == HiPriority)
 		return;
@@ -345,9 +367,10 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 //	while((UINT)Adapter->PackInfo[iIndex].uiCurrentPacketsOnHost >
 //		SF_MAX_ALLOWED_PACKETS_TO_BACKUP)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "uiCurrentBytesOnHost:%x uiMaxBucketSize :%x",
-		Adapter->PackInfo[iIndex].uiCurrentBytesOnHost,
-		Adapter->PackInfo[iIndex].uiMaxBucketSize);
+		bcm_dbg(Adapter, TX, PRUNE_QUEUE, ALL,
+			"uiCurrentBytesOnHost:%x uiMaxBucketSize :%x\n",
+			Adapter->PackInfo[iIndex].uiCurrentBytesOnHost,
+			Adapter->PackInfo[iIndex].uiMaxBucketSize);
 
 		PacketToDrop = Adapter->PackInfo[iIndex].FirstTxQueue;
 
@@ -378,7 +401,8 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 
 		}
 
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "Dropped Bytes:%x Dropped Packets:%x",
+		bcm_dbg(Adapter, TX, PRUNE_QUEUE, ALL,
+			"Dropped Bytes:%x Dropped Packets:%x\n",
 			Adapter->PackInfo[iIndex].uiDroppedCountBytes,
 			Adapter->PackInfo[iIndex].uiDroppedCountPackets);
 
@@ -387,9 +411,9 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 
 	spin_unlock_bh(&Adapter->PackInfo[iIndex].SFQueueLock);
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "TotalPacketCount:%x",
+	bcm_dbg(Adapter, TX, PRUNE_QUEUE, ALL, "TotalPacketCount:%x\n",
 		atomic_read(&Adapter->TotalPacketCount));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "<=====");
+	bcm_dbg(Adapter, TX, PRUNE_QUEUE, ALL, "<=====\n");
 }
 
 VOID flush_all_queues(PMINI_ADAPTER Adapter)
@@ -398,7 +422,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
 	UINT	uiTotalPacketLength;
 	struct sk_buff*			PacketToDrop=NULL;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "=====>");
+	bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "=====>\n");
 
 //	down(&Adapter->data_packet_queue_lock);
 	for(iQIndex=LowPriority; iQIndex<HiPriority; iQIndex++)
@@ -431,15 +455,16 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
 			Adapter->PackInfo[iQIndex].uiDroppedCountBytes += uiTotalPacketLength;
 			Adapter->PackInfo[iQIndex].uiDroppedCountPackets++;
 
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "Dropped Bytes:%x Dropped Packets:%x",
-					Adapter->PackInfo[iQIndex].uiDroppedCountBytes,
-					Adapter->PackInfo[iQIndex].uiDroppedCountPackets);
+			bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL,
+				"Dropped Bytes:%x Dropped Packets:%x\n",
+				Adapter->PackInfo[iQIndex].uiDroppedCountBytes,
+				Adapter->PackInfo[iQIndex].uiDroppedCountPackets);
 			atomic_dec(&Adapter->TotalPacketCount);
 		}
 		spin_unlock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock);
 	}
 //	up(&Adapter->data_packet_queue_lock);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "<=====");
+	bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "<=====\n");
 }
 
 USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
@@ -466,32 +491,37 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 	{
 		case eEth802LLCFrame:
 		{
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802LLCFrame\n");
+			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+				"ClassifyPacket : 802LLCFrame\n");
             pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_FRAME);
 			break;
 		}
 
 		case eEth802LLCSNAPFrame:
 		{
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802LLC SNAP Frame\n");
+			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+				"ClassifyPacket : 802LLC SNAP Frame\n");
 			pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_SNAP_FRAME);
 			break;
 		}
 		case eEth802QVLANFrame:
 		{
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802.1Q VLANFrame\n");
+			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+				"ClassifyPacket : 802.1Q VLANFrame\n");
 			pIpHeader = pvEThPayload + sizeof(ETH_CS_802_Q_FRAME);
 			break;
 		}
 		case eEthOtherFrame:
 		{
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : ETH Other Frame\n");
+			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+				"ClassifyPacket : ETH Other Frame\n");
 			pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
 			break;
 		}
 		default:
 		{
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : Unrecognized ETH Frame\n");
+			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+				"ClassifyPacket : Unrecognized ETH Frame\n");
 			pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
 			break;
 		}
@@ -509,13 +539,15 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 			pstClassifierRule = GetFragIPClsEntry(Adapter,pIpHeader->id, pIpHeader->saddr);
 			if(pstClassifierRule)
 			{
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,"It is next Fragmented pkt");
+				bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+					"It is next Fragmented pkt\n");
 					bClassificationSucceed=TRUE;
 			}
 			if(!(ntohs(pIpHeader->frag_off) & IP_MF))
 			{
 				//Fragmented Last packet . Remove Frag Classifier Entry
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,"This is the last fragmented Pkt");
+				bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+					"This is the last fragmented Pkt\n");
 				DelFragIPClsEntry(Adapter,pIpHeader->id, pIpHeader->saddr);
 			}
 		}
@@ -534,7 +566,9 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 				bClassificationSucceed=FALSE;
 				break;
 			}
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "Adapter->PackInfo[%d].bvalid=True\n",uiLoopIndex);
+			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+				"Adapter->PackInfo[%d].bvalid=True\n",
+				uiLoopIndex);
 
 			if(0 == Adapter->astClassifierTable[uiLoopIndex].ucDirection)
 			{
@@ -546,7 +580,8 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 
 			uiSfIndex = SearchSfid(Adapter,pstClassifierRule->ulSFID);
 			if (uiSfIndex >= NO_OF_QUEUES) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "Queue Not Valid. SearchSfid for this classifier Failed\n");
+				bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+					"Queue Not Valid. SearchSfid for this classifier Failed\n");
 				break;
 			}
 
@@ -555,19 +590,24 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 
 				if(eEthUnsupportedFrame==stEthCsPktInfo.eNwpktEthFrameType)
 				{
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  " ClassifyPacket : Packet Not a Valid Supported Ethernet Frame \n");
+					bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+						"ClassifyPacket : Packet Not a Valid Supported Ethernet Frame\n");
 					bClassificationSucceed = FALSE;
 					break;
 				}
 
 
 
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "Performing ETH CS Classification on Classifier Rule ID : %x Service Flow ID : %lx\n",pstClassifierRule->uiClassifierRuleIndex,Adapter->PackInfo[uiSfIndex].ulSFID);
+				bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+					"Performing ETH CS Classification on Classifier Rule ID : %x Service Flow ID : %lx\n",
+					pstClassifierRule->uiClassifierRuleIndex,
+					Adapter->PackInfo[uiSfIndex].ulSFID);
 				bClassificationSucceed = EThCSClassifyPkt(Adapter,skb,&stEthCsPktInfo,pstClassifierRule, Adapter->PackInfo[uiSfIndex].bEthCSSupport);
 
 				if(!bClassificationSucceed)
 				{
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "ClassifyPacket : Ethernet CS Classification Failed\n");
+					bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+						"ClassifyPacket : Ethernet CS Classification Failed\n");
 					break;
 				}
 			}
@@ -576,24 +616,28 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 			{
 				if(eEthOtherFrame != stEthCsPktInfo.eNwpktEthFrameType)
 				{
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  " ClassifyPacket : Packet Not a 802.3 Ethernet Frame... hence not allowed over non-ETH CS SF \n");
+					bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+						"ClassifyPacket : Packet Not a 802.3 Ethernet Frame... hence not allowed over non-ETH CS SF\n");
 					bClassificationSucceed = FALSE;
 					break;
 				}
 			}
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "Proceeding to IP CS Clasification");
+			bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+				"Proceeding to IP CS Clasification\n");
 
 			if(Adapter->PackInfo[uiSfIndex].bIPCSSupport)
 			{
 
 				if(stEthCsPktInfo.eNwpktIPFrameType == eNonIPPacket)
 				{
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  " ClassifyPacket : Packet is Not an IP Packet \n");
+					bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+						"ClassifyPacket : Packet is Not an IP Packet\n");
 					bClassificationSucceed = FALSE;
 					break;
 				}
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "Dump IP Header : \n");
+				bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+					"Dump IP Header :\n");
 				DumpFullPacket((PUCHAR)pIpHeader,20);
 
 				if(stEthCsPktInfo.eNwpktIPFrameType == eIPv4Packet)
@@ -607,7 +651,10 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 
 	if(bClassificationSucceed == TRUE)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "CF id : %d, SF ID is =%lu",pstClassifierRule->uiClassifierRuleIndex, pstClassifierRule->ulSFID);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"CF id : %d, SF ID is =%lu\n",
+			pstClassifierRule->uiClassifierRuleIndex,
+			pstClassifierRule->ulSFID);
 
 		//Store The matched Classifier in SKB
 		*((UINT32*)(skb->cb)+SKB_CB_CLASSIFICATION_OFFSET) = pstClassifierRule->uiClassifierRuleIndex;
@@ -625,7 +672,8 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 		}
 
 		usIndex = SearchSfid(Adapter, pstClassifierRule->ulSFID);
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "index is	=%d", usIndex);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"index is	=%d\n", usIndex);
 
 		//If this is the first fragment of a Fragmented pkt, add this CF. Only This CF should be used for all other fragment of this Pkt.
 		if(bFragmentedPkt && (usCurrFragment == 0))
@@ -655,10 +703,13 @@ static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCH
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	if(pstClassifierRule->ucEthCSSrcMACLen==0)
 		return TRUE;
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s \n",__FUNCTION__);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "%s\n", __func__);
 	for(i=0;i<MAC_ADDRESS_SIZE;i++)
 	{
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n",i,Mac[i],pstClassifierRule->au8EThCSSrcMAC[i],pstClassifierRule->au8EThCSSrcMACMask[i]);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n",
+			i, Mac[i], pstClassifierRule->au8EThCSSrcMAC[i],
+			pstClassifierRule->au8EThCSSrcMACMask[i]);
 		if((pstClassifierRule->au8EThCSSrcMAC[i] & pstClassifierRule->au8EThCSSrcMACMask[i])!=
 			(Mac[i] & pstClassifierRule->au8EThCSSrcMACMask[i]))
 			return FALSE;
@@ -672,10 +723,13 @@ static BOOLEAN EthCSMatchDestMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUC
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	if(pstClassifierRule->ucEthCSDestMACLen==0)
 		return TRUE;
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s \n",__FUNCTION__);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "%s\n", __func__);
 	for(i=0;i<MAC_ADDRESS_SIZE;i++)
 	{
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n",i,Mac[i],pstClassifierRule->au8EThCSDestMAC[i],pstClassifierRule->au8EThCSDestMACMask[i]);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n",
+			i, Mac[i], pstClassifierRule->au8EThCSDestMAC[i],
+			pstClassifierRule->au8EThCSDestMACMask[i]);
 		if((pstClassifierRule->au8EThCSDestMAC[i] & pstClassifierRule->au8EThCSDestMACMask[i])!=
 			(Mac[i] & pstClassifierRule->au8EThCSDestMACMask[i]))
 			return FALSE;
@@ -690,10 +744,17 @@ static BOOLEAN EthCSMatchEThTypeSAP(S_CLASSIFIER_RULE *pstClassifierRule,struct
 		(pstClassifierRule->au8EthCSEtherType[0] == 0))
 		return TRUE;
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s SrcEtherType:%x CLS EtherType[0]:%x\n",__FUNCTION__,pstEthCsPktInfo->usEtherType,pstClassifierRule->au8EthCSEtherType[0]);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"%s SrcEtherType:%x CLS EtherType[0]:%x\n",
+		__func__, pstEthCsPktInfo->usEtherType,
+		pstClassifierRule->au8EthCSEtherType[0]);
 	if(pstClassifierRule->au8EthCSEtherType[0] == 1)
 	{
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  CLS EtherType[1]:%x EtherType[2]:%x\n",__FUNCTION__,pstClassifierRule->au8EthCSEtherType[1],pstClassifierRule->au8EthCSEtherType[2]);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"%s  CLS EtherType[1]:%x EtherType[2]:%x\n",
+			__func__,
+			pstClassifierRule->au8EthCSEtherType[1],
+			pstClassifierRule->au8EthCSEtherType[2]);
 
 		if(memcmp(&pstEthCsPktInfo->usEtherType,&pstClassifierRule->au8EthCSEtherType[1],2)==0)
 			return TRUE;
@@ -706,7 +767,11 @@ static BOOLEAN EthCSMatchEThTypeSAP(S_CLASSIFIER_RULE *pstClassifierRule,struct
 		if(eEth802LLCFrame != pstEthCsPktInfo->eNwpktEthFrameType)
 			return FALSE;
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  EthCS DSAP:%x EtherType[2]:%x\n",__FUNCTION__,pstEthCsPktInfo->ucDSAP,pstClassifierRule->au8EthCSEtherType[2]);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"%s  EthCS DSAP:%x EtherType[2]:%x\n",
+			__func__,
+			pstEthCsPktInfo->ucDSAP,
+			pstClassifierRule->au8EthCSEtherType[2]);
 		if(pstEthCsPktInfo->ucDSAP == pstClassifierRule->au8EthCSEtherType[2])
 			return TRUE;
 		else
@@ -725,7 +790,11 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
 	B_UINT8 uPriority = 0;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  CLS UserPrio:%x CLS VLANID:%x\n",__FUNCTION__,ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),pstClassifierRule->usVLANID);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"%s  CLS UserPrio:%x CLS VLANID:%x\n",
+		__func__,
+		ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),
+		pstClassifierRule->usVLANID);
 
 	/* In case FW didn't receive the TLV, the priority field should be ignored */
 	if(pstClassifierRule->usValidityBitMap & (1<<PKT_CLASSIFICATION_USER_PRIORITY_VALID))
@@ -742,7 +811,8 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
 			return FALSE;
 	}
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "ETH CS 802.1 D  User Priority Rule Matched\n");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"ETH CS 802.1 D  User Priority Rule Matched\n");
 
 	bClassificationSucceed = FALSE;
 
@@ -753,7 +823,9 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
 
 		usVLANID = ntohs(*(USHORT *)(skb->data + sizeof(ETH_HEADER_STRUC))) & 0xFFF;
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  Pkt VLANID %x Priority: %d\n",__FUNCTION__,usVLANID, uPriority);
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"%s  Pkt VLANID %x Priority: %d\n",
+			__func__, usVLANID, uPriority);
 
 		if(usVLANID == ((pstClassifierRule->usVLANID & 0xFFF0) >> 4))
 			bClassificationSucceed = TRUE;
@@ -762,7 +834,8 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
 			return FALSE;
 	}
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "ETH CS 802.1 Q VLAN ID Rule Matched\n");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"ETH CS 802.1 Q VLAN ID Rule Matched\n");
 
 	return TRUE;
 }
@@ -777,26 +850,28 @@ static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,
 	bClassificationSucceed = EthCSMatchSrcMACAddress(pstClassifierRule,((ETH_HEADER_STRUC *)(skb->data))->au8SourceAddress);
 	if(!bClassificationSucceed)
 		return FALSE;
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "ETH CS SrcMAC Matched\n");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "ETH CS SrcMAC Matched\n");
 
 	bClassificationSucceed = EthCSMatchDestMACAddress(pstClassifierRule,((ETH_HEADER_STRUC*)(skb->data))->au8DestinationAddress);
 	if(!bClassificationSucceed)
 		return FALSE;
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "ETH CS DestMAC Matched\n");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "ETH CS DestMAC Matched\n");
 
 	//classify on ETHType/802.2SAP TLV
 	bClassificationSucceed = EthCSMatchEThTypeSAP(pstClassifierRule,skb,pstEthCsPktInfo);
 	if(!bClassificationSucceed)
 		return FALSE;
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "ETH CS EthType/802.2SAP Matched\n");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"ETH CS EthType/802.2SAP Matched\n");
 
 	//classify on 802.1VLAN Header Parameters
 
 	bClassificationSucceed = EthCSMatchVLANRules(pstClassifierRule,skb,pstEthCsPktInfo);
 	if(!bClassificationSucceed)
 		return FALSE;
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "ETH CS 802.1 VLAN Rules Matched\n");
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"ETH CS 802.1 VLAN Rules Matched\n");
 
 	return bClassificationSucceed;
 }
@@ -806,10 +881,12 @@ static void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,
 {
 	USHORT u16Etype = ntohs(((ETH_HEADER_STRUC*)pvEthPayload)->u16Etype);
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "EthCSGetPktInfo : Eth Hdr Type : %X\n",u16Etype);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"EthCSGetPktInfo : Eth Hdr Type : %X\n", u16Etype);
 	if(u16Etype > 0x5dc)
 	{
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "EthCSGetPktInfo : ETH2 Frame \n");
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+			"EthCSGetPktInfo : ETH2 Frame\n");
 		//ETH2 Frame
 		if(u16Etype == ETHERNET_FRAMETYPE_802QVLAN)
 		{
@@ -828,7 +905,7 @@ static void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,
 	else
 	{
 		//802.2 LLC
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "802.2 LLC Frame \n");
+		bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "802.2 LLC Frame\n");
 		pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCFrame;
 		pstEthCsPktInfo->ucDSAP = ((ETH_CS_802_LLC_FRAME*)pvEthPayload)->DSAP;
 		if(pstEthCsPktInfo->ucDSAP == 0xAA && ((ETH_CS_802_LLC_FRAME*)pvEthPayload)->SSAP == 0xAA)
@@ -846,9 +923,14 @@ static void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,
 		pstEthCsPktInfo->eNwpktIPFrameType = eNonIPPacket;
 
 	pstEthCsPktInfo->usEtherType = ((ETH_HEADER_STRUC*)pvEthPayload)->u16Etype;
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "EthCsPktInfo->eNwpktIPFrameType : %x\n",pstEthCsPktInfo->eNwpktIPFrameType);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "EthCsPktInfo->eNwpktEthFrameType : %x\n",pstEthCsPktInfo->eNwpktEthFrameType);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "EthCsPktInfo->usEtherType : %x\n",pstEthCsPktInfo->usEtherType);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"EthCsPktInfo->eNwpktIPFrameType : %x\n",
+		pstEthCsPktInfo->eNwpktIPFrameType);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
+		"EthCsPktInfo->eNwpktEthFrameType : %x\n",
+		pstEthCsPktInfo->eNwpktEthFrameType);
+	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "EthCsPktInfo->usEtherType : %x\n",
+		pstEthCsPktInfo->usEtherType);
 }
 
 
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index d5e4a74..589d0ea 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -45,24 +45,29 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket)
 {
 	PLEADER PLeader = (PLEADER)pControlPacket;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Tx");
+	bcm_dbg(Adapter, TX, TX_CONTROL, ALL, "Tx\n");
 	if(!pControlPacket || !Adapter)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Got NULL Control Packet or Adapter");
+		bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+			"Got NULL Control Packet or Adapter\n");
 		return STATUS_FAILURE;
 	}
 	if((atomic_read( &Adapter->CurrNumFreeTxDesc ) <
 		((PLeader->PLength-1)/MAX_DEVICE_DESC_SIZE)+1))
     {
-    	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "NO FREE DESCRIPTORS TO SEND CONTROL PACKET");
+	    bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+		    "NO FREE DESCRIPTORS TO SEND CONTROL PACKET\n");
         return STATUS_FAILURE;
     }
 
 	/* Update the netdevice statistics */
 	/* Dump Packet  */
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Leader Status: %x", PLeader->Status);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Leader VCID: %x",PLeader->Vcid);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Leader Length: %x",PLeader->PLength);
+	bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+		"Leader Status: %x\n", PLeader->Status);
+	bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+		"Leader VCID: %x\n", PLeader->Vcid);
+	bcm_dbg(Adapter, TX, TX_CONTROL, ALL,
+		"Leader Length: %x\n", PLeader->PLength);
 	if(Adapter->device_removed)
 		return 0;
 
@@ -74,7 +79,7 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket)
 					pControlPacket, (PLeader->PLength + LEADER_SIZE));
 
 	atomic_dec(&Adapter->CurrNumFreeTxDesc);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "<=========");
+	bcm_dbg(Adapter, TX, TX_CONTROL, ALL, "<=========\n");
 	return STATUS_SUCCESS;
 }
 
@@ -115,7 +120,8 @@ INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
 
 	if(status != STATUS_SUCCESS)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "PHS Transmit failed..\n");
+		bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+			"PHS Transmit failed..\n");
 		goto errExit;
 	}
 
@@ -133,7 +139,8 @@ INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
         {
 			if((status = skb_cow(Packet,LEADER_SIZE)))
 			{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"bcm_transmit : Failed To Increase headRoom\n");
+				bcm_dbg(Adapter, TX, NEXT_SEND, ALL,
+					"bcm_transmit : Failed To Increase headRoom\n");
 				goto errExit;
 			}
 		}
@@ -237,13 +244,15 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
 			Adapter->LinkStatus == SYNC_UP_REQUEST &&
 			!Adapter->bSyncUpRequestSent)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Calling LinkMessage");
+			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+				"Calling LinkMessage\n");
 			LinkMessage(Adapter);
 		}
 
 		if((Adapter->IdleMode || Adapter->bShutStatus) && atomic_read(&Adapter->TotalPacketCount))
 		{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Device in Low Power mode...waking up");
+			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
+				"Device in Low Power mode...waking up\n");
     			Adapter->usIdleModePattern = ABORT_IDLE_MODE;
 				Adapter->bWakeUpDevice = TRUE;
 				wake_up(&Adapter->process_rx_cntrlpkt);
@@ -254,7 +263,7 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
 		atomic_set(&Adapter->TxPktAvail, 0);
 	}
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Exiting the tx thread..\n");
+	bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "Exiting the tx thread..\n");
 	Adapter->transmit_packet_thread = NULL;
 	return 0;
 }
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 101c4e3..f98b6ca 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -20,7 +20,8 @@ INT ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMib
 	UINT nClassifierIndex = 0, nPhsTableIndex = 0, nSfIndex = 0, uiIndex = 0;
 
 	if (pDeviceExtension == NULL) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, HOST_MIBS, DBG_LVL_ALL, "Invalid Device Extension\n");
+		bcm_dbg(Adapter, OTHERS, HOST_MIBS, ALL,
+			"Invalid Device Extension\n");
 		return STATUS_FAILURE;
 	}
 
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index c7f4886..78f4069 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -46,9 +46,8 @@ static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
 				msecs_to_jiffies(timeout));
 
 		if (kthread_should_stop()) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-				DBG_LVL_ALL,
-				"Led thread got signal to exit..hence exiting");
+			bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+				"Led thread got signal to exit..hence exiting\n");
 			Adapter->LEDInfo.led_thread_running =
 					BCM_LED_THREAD_DISABLED;
 			TURN_OFF_LED(GPIO_Num, uiLedIndex);
@@ -204,9 +203,8 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
 					msecs_to_jiffies(timeout));
 
 			if (kthread_should_stop()) {
-				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
-					LED_DUMP_INFO, DBG_LVL_ALL,
-					"Led thread got signal to exit..hence exiting");
+				bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+					"Led thread got signal to exit..hence exiting\n");
 				Adapter->LEDInfo.led_thread_running =
 						BCM_LED_THREAD_DISABLED;
 				return EVENT_SIGNALED;
@@ -269,15 +267,14 @@ static INT ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG ulParamOffset,
 	USHORT usChksmOrg = 0;
 	USHORT usChecksumCalculated = 0;
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
-		"LED Thread:ValidateDSDParamsChecksum: 0x%lx 0x%X",
+	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+		"LED Thread:ValidateDSDParamsChecksum: 0x%lx 0x%X\n",
 		ulParamOffset, usParamLen);
 
 	puBuffer = kmalloc(usParamLen, GFP_KERNEL);
 	if (!puBuffer) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-			DBG_LVL_ALL,
-			"LED Thread: ValidateDSDParamsChecksum Allocation failed");
+		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+			"LED Thread: ValidateDSDParamsChecksum Allocation failed\n");
 		return -ENOMEM;
 
 	}
@@ -285,16 +282,15 @@ static INT ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG ulParamOffset,
 	/* Read the DSD data from the parameter offset. */
 	if (STATUS_SUCCESS != BeceemNVMRead(Adapter, (PUINT)puBuffer,
 			ulParamOffset, usParamLen)) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-			DBG_LVL_ALL,
-			"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");
+		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+			"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed\n");
 		Status = STATUS_IMAGE_CHECKSUM_MISMATCH;
 		goto exit;
 	}
 
 	/* Calculate the checksum of the data read from the DSD parameter. */
 	usChecksumCalculated = CFG_CalculateChecksum(puBuffer, usParamLen);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 		"LED Thread: usCheckSumCalculated = 0x%x\n",
 		usChecksumCalculated);
 
@@ -304,24 +300,22 @@ static INT ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG ulParamOffset,
 	 */
 	if (STATUS_SUCCESS != BeceemNVMRead(Adapter, (PUINT)&usChksmOrg,
 			ulParamOffset+usParamLen, 2)) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-			DBG_LVL_ALL,
-			"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");
+		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+			"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed\n");
 		Status = STATUS_IMAGE_CHECKSUM_MISMATCH;
 		goto exit;
 	}
 	usChksmOrg = ntohs(usChksmOrg);
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
-		"LED Thread: usChksmOrg = 0x%x", usChksmOrg);
+	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+		"LED Thread: usChksmOrg = 0x%x\n", usChksmOrg);
 
 	/*
 	 * Compare the checksum calculated with the checksum read
 	 * from DSD section
 	 */
 	if (usChecksumCalculated ^ usChksmOrg) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-			DBG_LVL_ALL,
-			"LED Thread: ValidateDSDParamsChecksum: Checksums don't match");
+		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+			"LED Thread: ValidateDSDParamsChecksum: Checksums don't match\n");
 		Status = STATUS_IMAGE_CHECKSUM_MISMATCH;
 		goto exit;
 	}
@@ -364,8 +358,8 @@ static INT ValidateHWParmStructure(PMINI_ADAPTER Adapter, ULONG ulHwParamOffset)
 	if (0 == HwParamLen || HwParamLen > Adapter->uiNVMDSDSize)
 		return STATUS_IMAGE_CHECKSUM_MISMATCH;
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
-		"LED Thread:HwParamLen = 0x%x", HwParamLen);
+	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+		"LED Thread:HwParamLen = 0x%x\n", HwParamLen);
 	Status = ValidateDSDParamsChecksum(Adapter, ulHwParamOffset,
 						HwParamLen);
 	return Status;
@@ -385,8 +379,8 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
 	BeceemNVMRead(Adapter, (PUINT)&usEEPROMVersion,
 			EEPROM_VERSION_OFFSET, 2);
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
-		"usEEPROMVersion: Minor:0x%X Major:0x%x",
+	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+		"usEEPROMVersion: Minor:0x%X Major:0x%x\n",
 		usEEPROMVersion&0xFF, ((usEEPROMVersion>>8)&0xFF));
 
 
@@ -413,8 +407,8 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
 	}
 
 
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
-		"LED Thread: Start address of HW_PARAM structure = 0x%lx",
+	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+		"LED Thread: Start address of HW_PARAM structure = 0x%lx\n",
 		dwReadValue);
 
 	/*
@@ -471,8 +465,9 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
 		}
 
 	}
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
-		"GPIO's bit map correspond to LED :0x%X", Adapter->gpioBitMap);
+	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+		"GPIO's bit map correspond to LED :0x%X\n",
+		Adapter->gpioBitMap);
 	return Status;
 }
 
@@ -490,8 +485,8 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
 	memset(GPIO_Array, DISABLE_GPIO_NUM, NUM_OF_LEDS+1);
 
 	if (!Adapter->pstargetparams || IS_ERR(Adapter->pstargetparams)) {
-		BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-			DBG_LVL_ALL, "Target Params not Avail.\n");
+		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+			"Target Params not Avail\n");
 		return -ENOENT;
 	}
 
@@ -510,7 +505,7 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
 	 * CONFIG file read successfully. Deallocate the memory of
 	 * uiFileNameBufferSize
 	 */
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+	bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 		"LED Thread: Config file read successfully\n");
 	puCFGData = (PUCHAR) &Adapter->pstargetparams->HostDrvrConfig1;
 
@@ -588,8 +583,8 @@ static VOID LedGpioInit(PMINI_ADAPTER Adapter)
 	/* Set all LED GPIO Mode to output mode */
 	if (rdmalt(Adapter, GPIO_MODE_REGISTER, &uiResetValue,
 			sizeof(uiResetValue)) < 0)
-		BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-			DBG_LVL_ALL, "LED Thread: RDM Failed\n");
+		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+			"LED Thread: RDM Failed\n");
 	for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
 		if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num !=
 				DISABLE_GPIO_NUM)
@@ -599,8 +594,8 @@ static VOID LedGpioInit(PMINI_ADAPTER Adapter)
 	}
 	if (wrmalt(Adapter, GPIO_MODE_REGISTER, &uiResetValue,
 			sizeof(uiResetValue)) < 0)
-		BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-			DBG_LVL_ALL, "LED Thread: WRM Failed\n");
+		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+			"LED Thread: WRM Failed\n");
 
 	Adapter->LEDInfo.bIdle_led_off = FALSE;
 }
@@ -686,9 +681,8 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 						|| kthread_should_stop());
 
 		if (kthread_should_stop() || Adapter->device_removed) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-				DBG_LVL_ALL,
-				"Led thread got signal to exit..hence exiting");
+			bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+				"Led thread got signal to exit..hence exiting\n");
 			Adapter->LEDInfo.led_thread_running =
 						BCM_LED_THREAD_DISABLED;
 			TURN_OFF_LED(1 << GPIO_num, uiLedIndex);
@@ -716,8 +710,7 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 			break;
 		case FW_DOWNLOAD:
 			/*
-			 * BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
-			 *	LED_DUMP_INFO, DBG_LVL_ALL,
+			 * bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 			 *	"LED Thread: FW_DN_DONE called\n");
 			 */
 			currdriverstate = FW_DOWNLOAD;
@@ -825,8 +818,8 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 			/* Adapter->DriverState = DRIVER_INIT; */
 			break;
 		case LED_THREAD_INACTIVE:
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-				DBG_LVL_ALL, "InActivating LED thread...");
+			bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+				"InActivating LED thread...\n");
 			currdriverstate = LED_THREAD_INACTIVE;
 			Adapter->LEDInfo.led_thread_running =
 					BCM_LED_THREAD_RUNNING_INACTIVELY;
@@ -839,8 +832,8 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 			}
 			break;
 		case LED_THREAD_ACTIVE:
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-				DBG_LVL_ALL, "Activating LED thread again...");
+			bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
+				"Activating LED thread again...\n");
 			if (Adapter->LinkUpStatus == FALSE)
 				Adapter->DriverState = NO_NETWORK_ENTRY;
 			else
@@ -877,8 +870,7 @@ int InitLedSettings(PMINI_ADAPTER Adapter)
 	 */
 	Status = ReadConfigFileStructure(Adapter, &bEnableThread);
 	if (STATUS_SUCCESS != Status) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-			DBG_LVL_ALL,
+		bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 			"LED Thread: FAILED in ReadConfigFileStructure\n");
 		return Status;
 	}
@@ -904,8 +896,7 @@ int InitLedSettings(PMINI_ADAPTER Adapter)
 			kthread_run((int (*)(void *)) LEDControlThread,
 			Adapter, "led_control_thread");
 		if (IS_ERR(Adapter->LEDInfo.led_cntrl_threadid)) {
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
-				DBG_LVL_ALL,
+			bcm_dbg(Adapter, OTHERS, LED_DUMP_INFO, ALL,
 				"Not able to spawn Kernel Thread\n");
 			Adapter->LEDInfo.led_thread_running =
 				BCM_LED_THREAD_DISABLED;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 6ca3ce0..6579357 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -270,7 +270,7 @@ INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
 	UINT uiByteOffset	= 0;
 	UINT uiTempOffset	= 0;
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL," ====> ");
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "====>\n");
 
 	uiTempOffset = uiOffset - (uiOffset % MAX_RW_SIZE);
 	uiByteOffset = uiOffset - uiTempOffset;
@@ -2301,7 +2301,8 @@ INT BcmUpdateSectorSize(PMINI_ADAPTER Adapter,UINT uiSectorSize)
 		{
 			if(uiSectorSize == uiCurrentSectorSize)
 			{
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Provided sector size is same as programmed in Flash");
+				bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+					"Provided sector size is same as programmed in Flash\n");
 				Status = STATUS_SUCCESS;
 				goto Restore ;
 			}
@@ -2398,7 +2399,8 @@ static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig
 		}
 	}
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Sector size  :%x \n", Adapter->uiSectorSize);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"Sector size  :%x\n", Adapter->uiSectorSize);
 	return Adapter->uiSectorSize;
 }
 
@@ -2420,12 +2422,13 @@ static INT BcmInitEEPROMQueues(PMINI_ADAPTER Adapter)
 	/* CHIP Bug : Clear the Avail bits on the Read queue. The default
 	 * value on this register is supposed to be 0x00001102.
 	 * But we get 0x00001122. */
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Fixing reset value on 0x0f003004 register\n" );
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"Fixing reset value on 0x0f003004 register\n");
 	value = EEPROM_READ_DATA_AVAIL;
 	wrmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
 
 	/* Flush the all the EEPROM queues. */
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, " Flushing the queues\n");
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Flushing the queues\n");
 	value =EEPROM_ALL_QUEUE_FLUSH ;
 	wrmalt( Adapter, SPI_FLUSH_REG, &value, sizeof(value));
 
@@ -2433,7 +2436,9 @@ static INT BcmInitEEPROMQueues(PMINI_ADAPTER Adapter)
 	wrmalt( Adapter, SPI_FLUSH_REG, &value, sizeof(value) );
 
 	/* Read the EEPROM Status Register. Just to see, no real purpose. */
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "EEPROM Status register value = %x\n", ReadEEPROMStatusRegister(Adapter) );
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"EEPROM Status register value = %x\n",
+		ReadEEPROMStatusRegister(Adapter));
 
 	return STATUS_SUCCESS;
 } /* BcmInitEEPROMQueues() */
@@ -2605,58 +2610,138 @@ INT BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
 static INT	BcmDumpFlash2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo,PMINI_ADAPTER Adapter)
 {
 	UINT Index = 0;
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "**********************FLASH2X CS Structure *******************");
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Signature is  :%x", (psFlash2xCSInfo->MagicNumber));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Flash Major Version :%d", MAJOR_VERSION(psFlash2xCSInfo->FlashLayoutVersion));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Flash Minor Version :%d", MINOR_VERSION(psFlash2xCSInfo->FlashLayoutVersion));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, " ISOImageMajorVersion:0x%x", (psFlash2xCSInfo->ISOImageVersion));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "SCSIFirmwareMajorVersion :0x%x", (psFlash2xCSInfo->SCSIFirmwareVersion));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForPart1ISOImage :0x%x", (psFlash2xCSInfo->OffsetFromZeroForPart1ISOImage));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForScsiFirmware :0x%x", (psFlash2xCSInfo->OffsetFromZeroForScsiFirmware));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "SizeOfScsiFirmware  :0x%x", (psFlash2xCSInfo->SizeOfScsiFirmware ));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForPart2ISOImage :0x%x", (psFlash2xCSInfo->OffsetFromZeroForPart2ISOImage));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForDSDStart :0x%x", (psFlash2xCSInfo->OffsetFromZeroForDSDStart));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForDSDEnd :0x%x", (psFlash2xCSInfo->OffsetFromZeroForDSDEnd));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForVSAStart :0x%x", (psFlash2xCSInfo->OffsetFromZeroForVSAStart));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForVSAEnd :0x%x", (psFlash2xCSInfo->OffsetFromZeroForVSAEnd));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForControlSectionStart :0x%x", (psFlash2xCSInfo->OffsetFromZeroForControlSectionStart));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForControlSectionData :0x%x", (psFlash2xCSInfo->OffsetFromZeroForControlSectionData));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "CDLessInactivityTimeout :0x%x", (psFlash2xCSInfo->CDLessInactivityTimeout));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "NewImageSignature :0x%x", (psFlash2xCSInfo->NewImageSignature));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "FlashSectorSizeSig :0x%x", (psFlash2xCSInfo->FlashSectorSizeSig));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "FlashSectorSize :0x%x", (psFlash2xCSInfo->FlashSectorSize));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "FlashWriteSupportSize :0x%x", (psFlash2xCSInfo->FlashWriteSupportSize));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "TotalFlashSize :0x%X", (psFlash2xCSInfo->TotalFlashSize));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "FlashBaseAddr :0x%x", (psFlash2xCSInfo->FlashBaseAddr));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "FlashPartMaxSize :0x%x", (psFlash2xCSInfo->FlashPartMaxSize));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "IsCDLessDeviceBootSig :0x%x", (psFlash2xCSInfo->IsCDLessDeviceBootSig));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "MassStorageTimeout :0x%x", (psFlash2xCSInfo->MassStorageTimeout));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage1Part1Start :0x%x", (psFlash2xCSInfo->OffsetISOImage1Part1Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage1Part1End :0x%x", (psFlash2xCSInfo->OffsetISOImage1Part1End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage1Part2Start :0x%x", (psFlash2xCSInfo->OffsetISOImage1Part2Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage1Part2End :0x%x", (psFlash2xCSInfo->OffsetISOImage1Part2End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage1Part3Start :0x%x", (psFlash2xCSInfo->OffsetISOImage1Part3Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage1Part3End :0x%x", (psFlash2xCSInfo->OffsetISOImage1Part3End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage2Part1Start :0x%x", (psFlash2xCSInfo->OffsetISOImage2Part1Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage2Part1End	:0x%x", (psFlash2xCSInfo->OffsetISOImage2Part1End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage2Part2Start :0x%x", (psFlash2xCSInfo->OffsetISOImage2Part2Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage2Part2End :0x%x", (psFlash2xCSInfo->OffsetISOImage2Part2End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage2Part3Start :0x%x", (psFlash2xCSInfo->OffsetISOImage2Part3Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetISOImage2Part3End :0x%x", (psFlash2xCSInfo->OffsetISOImage2Part3End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromDSDStartForDSDHeader :0x%x", (psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForDSD1Start :0x%x", (psFlash2xCSInfo->OffsetFromZeroForDSD1Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForDSD1End :0x%x", (psFlash2xCSInfo->OffsetFromZeroForDSD1End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForDSD2Start :0x%x", (psFlash2xCSInfo->OffsetFromZeroForDSD2Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForDSD2End :0x%x", (psFlash2xCSInfo->OffsetFromZeroForDSD2End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForVSA1Start :0x%x", (psFlash2xCSInfo->OffsetFromZeroForVSA1Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForVSA1End :0x%x", (psFlash2xCSInfo->OffsetFromZeroForVSA1End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForVSA2Start :0x%x", (psFlash2xCSInfo->OffsetFromZeroForVSA2Start));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "OffsetFromZeroForVSA2End :0x%x", (psFlash2xCSInfo->OffsetFromZeroForVSA2End));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Sector Access Bit Map is Defined as :");
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"**********************FLASH2X CS Structure *******************\n");
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Signature is  :%x\n",
+		psFlash2xCSInfo->MagicNumber);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Flash Major Version :%d\n",
+		MAJOR_VERSION(psFlash2xCSInfo->FlashLayoutVersion));
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Flash Minor Version :%d\n",
+		MINOR_VERSION(psFlash2xCSInfo->FlashLayoutVersion));
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "ISOImageMajorVersion:0x%x\n",
+		psFlash2xCSInfo->ISOImageVersion);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"SCSIFirmwareMajorVersion :0x%x\n",
+		psFlash2xCSInfo->SCSIFirmwareVersion);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForPart1ISOImage :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForPart1ISOImage);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForScsiFirmware :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForScsiFirmware);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "SizeOfScsiFirmware  :0x%x\n",
+		psFlash2xCSInfo->SizeOfScsiFirmware);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForPart2ISOImage :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForPart2ISOImage);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForDSDStart :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForDSDStart);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "OffsetFromZeroForDSDEnd :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForDSDEnd);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForVSAStart :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForVSAStart);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForVSAEnd :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForVSAEnd);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForControlSectionStart :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForControlSectionStart);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForControlSectionData :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForControlSectionData);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"CDLessInactivityTimeout :0x%x\n",
+		psFlash2xCSInfo->CDLessInactivityTimeout);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "NewImageSignature :0x%x\n",
+		psFlash2xCSInfo->NewImageSignature);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "FlashSectorSizeSig :0x%x\n",
+		psFlash2xCSInfo->FlashSectorSizeSig);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "FlashSectorSize :0x%x\n",
+		psFlash2xCSInfo->FlashSectorSize);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "FlashWriteSupportSize :0x%x\n",
+		psFlash2xCSInfo->FlashWriteSupportSize);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "TotalFlashSize :0x%X\n",
+		psFlash2xCSInfo->TotalFlashSize);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "FlashBaseAddr :0x%x\n",
+		psFlash2xCSInfo->FlashBaseAddr);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "FlashPartMaxSize :0x%x\n",
+		psFlash2xCSInfo->FlashPartMaxSize);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "IsCDLessDeviceBootSig :0x%x\n",
+		psFlash2xCSInfo->IsCDLessDeviceBootSig);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "MassStorageTimeout :0x%x\n",
+		psFlash2xCSInfo->MassStorageTimeout);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage1Part1Start :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage1Part1Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage1Part1End :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage1Part1End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage1Part2Start :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage1Part2Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage1Part2End :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage1Part2End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage1Part3Start :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage1Part3Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage1Part3End :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage1Part3End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage2Part1Start :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage2Part1Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage2Part1End	:0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage2Part1End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage2Part2Start :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage2Part2Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage2Part2End :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage2Part2End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage2Part3Start :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage2Part3Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetISOImage2Part3End :0x%x\n",
+		psFlash2xCSInfo->OffsetISOImage2Part3End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromDSDStartForDSDHeader :0x%x\n",
+		psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForDSD1Start :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForDSD1Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForDSD1End :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForDSD1End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForDSD2Start :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForDSD2Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForDSD2End :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForDSD2End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForVSA1Start :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForVSA1Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForVSA1End :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForVSA1End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForVSA2Start :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForVSA2Start);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"OffsetFromZeroForVSA2End :0x%x\n",
+		psFlash2xCSInfo->OffsetFromZeroForVSA2End);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"Sector Access Bit Map is Defined as :\n");
 	for(Index =0; Index <(FLASH2X_TOTAL_SIZE/(DEFAULT_SECTOR_SIZE *16)); Index++)
 	{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "SectorAccessBitMap[%d] :0x%x", Index,
-				(psFlash2xCSInfo->SectorAccessBitMap[Index]));
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"SectorAccessBitMap[%d] :0x%x\n",
+			Index, psFlash2xCSInfo->SectorAccessBitMap[Index]);
 	}
 
 	return STATUS_SUCCESS;
@@ -2882,9 +2967,11 @@ static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
 	BeceemFlashBulkRead(Adapter,(PUINT)Adapter->psFlashCSInfo,Adapter->ulFlashControlSectionStart,8);
 
 	Adapter->psFlashCSInfo->FlashLayoutVersion =  ntohl(Adapter->psFlashCSInfo->FlashLayoutVersion);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Flash Layout Version :%X", (Adapter->psFlashCSInfo->FlashLayoutVersion));
-	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Flash Layout Minor Version :%d\n", ntohs(sFlashCsInfo.FlashLayoutMinorVersion));
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Signature is  :%x\n", ntohl(Adapter->psFlashCSInfo->MagicNumber));
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Flash Layout Version :%X\n",
+		Adapter->psFlashCSInfo->FlashLayoutVersion);
+	//bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Flash Layout Minor Version :%d\n", ntohs(sFlashCsInfo.FlashLayoutMinorVersion));
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Signature is  :%x\n",
+		ntohl(Adapter->psFlashCSInfo->MagicNumber));
 
 	if(FLASH_CONTROL_STRUCT_SIGNATURE == ntohl(Adapter->psFlashCSInfo->MagicNumber))
 	{
@@ -2897,7 +2984,8 @@ static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
 		uiFlashLayoutMajorVersion = 0;
 	}
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"FLASH LAYOUT MAJOR VERSION :%X", uiFlashLayoutMajorVersion);
+bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+	"FLASH LAYOUT MAJOR VERSION :%X\n", uiFlashLayoutMajorVersion);
 
 	if(uiFlashLayoutMajorVersion < FLASH_2X_MAJOR_NUMBER)
 	{
@@ -3375,7 +3463,8 @@ static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter)
 	if(DSD2 == uiHighestPriDSD)
 		Adapter->ulFlashCalStart = Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start;
 	if(Adapter->eActiveDSD)
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Active DSD :%d", Adapter->eActiveDSD);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Active DSD :%d\n",
+			Adapter->eActiveDSD);
 	if(Adapter->eActiveDSD == 0)
 	{
 		//if No DSD gets Active, Make Active the DSD with WR  permission
@@ -3423,7 +3512,8 @@ static INT BcmGetActiveISO(PMINI_ADAPTER Adapter)
 		Adapter->uiActiveISOOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start);
 
 	if(Adapter->eActiveISO)
-	 	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Active ISO :%x", Adapter->eActiveISO);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Active ISO :%x\n",
+			Adapter->eActiveISO);
 
 	return STATUS_SUCCESS;
 }
@@ -3463,18 +3553,29 @@ B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset)
 
 static INT BcmDumpFlash2xSectionBitMap(PFLASH2X_BITMAP psFlash2xBitMap)
 {
-    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "***************Flash 2.x Section Bitmap***************");
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"ISO_IMAGE1  :0X%x", psFlash2xBitMap->ISO_IMAGE1);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"ISO_IMAGE2  :0X%x", psFlash2xBitMap->ISO_IMAGE2);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"DSD0  :0X%x", psFlash2xBitMap->DSD0);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"DSD1  :0X%x", psFlash2xBitMap->DSD1);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"DSD2  :0X%x", psFlash2xBitMap->DSD2);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"VSA0  :0X%x", psFlash2xBitMap->VSA0);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"VSA1  :0X%x", psFlash2xBitMap->VSA1);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"VSA2  :0X%x", psFlash2xBitMap->VSA2);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"SCSI  :0X%x", psFlash2xBitMap->SCSI);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"CONTROL_SECTION  :0X%x", psFlash2xBitMap->CONTROL_SECTION);
+	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"***************Flash 2.x Section Bitmap***************\n");
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"ISO_IMAGE1  :0X%x\n", psFlash2xBitMap->ISO_IMAGE1);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"ISO_IMAGE2  :0X%x\n", psFlash2xBitMap->ISO_IMAGE2);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"DSD0  :0X%x\n", psFlash2xBitMap->DSD0);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"DSD1  :0X%x\n", psFlash2xBitMap->DSD1);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"DSD2  :0X%x\n", psFlash2xBitMap->DSD2);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"VSA0  :0X%x\n", psFlash2xBitMap->VSA0);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"VSA1  :0X%x\n", psFlash2xBitMap->VSA1);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"VSA2  :0X%x\n", psFlash2xBitMap->VSA2);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"SCSI  :0X%x\n", psFlash2xBitMap->SCSI);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"CONTROL_SECTION  :0X%x\n", psFlash2xBitMap->CONTROL_SECTION);
 
 	return STATUS_SUCCESS;
 }
@@ -3822,7 +3923,9 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
 
 				if(HighestPriISO == eFlash2xSectVal	)
 				{
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Given ISO<%x> already  has highest priority",eFlash2xSectVal );
+					bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+						"Given ISO<%x> already  has highest priority\n",
+						eFlash2xSectVal);
 					Status = STATUS_SUCCESS ;
 					break;
 				}
@@ -3834,7 +3937,9 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
 					// This is a SPECIAL Case which will only happen if the current highest priority ISO has priority value = 0x7FFFFFFF.
 					// We will write 1 to the current Highest priority ISO And then shall increase the priority of the requested ISO
 					// by user
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",eFlash2xSectVal);
+					bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+						"SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",
+						eFlash2xSectVal);
 					SectImagePriority = htonl(0x1);
 					Status = BcmFlash2xBulkWrite(Adapter,
 								&SectImagePriority,
@@ -3854,7 +3959,9 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
 
 					if(HighestPriISO == eFlash2xSectVal	)
 					{
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Given ISO<%x> already  has highest priority",eFlash2xSectVal );
+						bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+							"Given ISO<%x> already  has highest priority\n",
+							eFlash2xSectVal);
 						Status = STATUS_SUCCESS ;
 						break;
 					}
@@ -3893,7 +4000,9 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
 
 				if((HighestPriDSD == eFlash2xSectVal))
 				{
-					BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Given DSD<%x> already  has highest priority", eFlash2xSectVal);
+					bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+						"Given DSD<%x> already  has highest priority\n",
+						eFlash2xSectVal);
 					Status = STATUS_SUCCESS ;
 					break;
 				}
@@ -3925,7 +4034,9 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
 
 					if((HighestPriDSD == eFlash2xSectVal))
 					{
-						BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Made the DSD: %x highest by reducing priority of other\n", eFlash2xSectVal);
+						bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+							"Made the DSD: %x highest by reducing priority of other\n",
+							eFlash2xSectVal);
 						Status = STATUS_SUCCESS ;
 						break;
 					}
@@ -4092,7 +4203,8 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 			if(uiTotalDataToCopy == Adapter->uiSectorSize)
 			{
 				//Setting for write of first sector. First sector is assumed to be written in last
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Writing the signature sector");
+				bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+					"Writing the signature sector\n");
 				eISOReadPart = ISO_IMAGE1 ;
 				uiReadOffsetWithinPart = 0;
 				eISOWritePart = ISO_IMAGE2;
@@ -4226,7 +4338,8 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
 			if(uiTotalDataToCopy == Adapter->uiSectorSize)
 			{
 				//Setting for write of first sector. First sector is assumed to be written in last
-				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Writing the signature sector");
+				bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+					"Writing the signature sector\n");
 				eISOReadPart = ISO_IMAGE2 ;
 				uiReadOffsetWithinPart = 0;
 				eISOWritePart = ISO_IMAGE1;
@@ -4350,7 +4463,9 @@ INT BcmFlash2xCorruptSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
 	}
 	else
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Given Section <%d>does not have Header",eFlash2xSectionVal);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"Given Section <%d>does not have Header\n",
+			eFlash2xSectionVal);
 		return STATUS_SUCCESS;
 	}
 	return Status;
@@ -4375,7 +4490,8 @@ INT BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionV
 
 	if(Adapter->bSigCorrupted == FALSE)
 	{
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Signature is not corrupted by driver, hence not restoring\n");
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"Signature is not corrupted by driver, hence not restoring\n");
 		return STATUS_SUCCESS;
 	}
 	if(Adapter->bAllDSDWriteAllow == FALSE)
@@ -4418,7 +4534,7 @@ INT BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionV
 		return STATUS_FAILURE;
 	}
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Restoring the signature");
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Restoring the signature\n");
 
 
 	Adapter->bHeaderChangeAllowed = TRUE;
@@ -4454,7 +4570,9 @@ INT	validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2x
 		return FALSE;
 	}
 	uiSectStartOffset = BcmGetSectionValStartOffset(Adapter,psFlash2xReadWrite->Section);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Start offset :%x ,section :%d\n",uiSectStartOffset,psFlash2xReadWrite->Section);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"Start offset :%x ,section :%d\n",
+		uiSectStartOffset, psFlash2xReadWrite->Section);
 	if((psFlash2xReadWrite->Section == ISO_IMAGE1) ||(psFlash2xReadWrite->Section == ISO_IMAGE2))
 	{
 		if(psFlash2xReadWrite->Section == ISO_IMAGE1)
@@ -4481,11 +4599,13 @@ INT	validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2x
 		//it should be added in startoffset. so that check done in last of this function can be valued.
 		uiSectEndOffset = uiSectStartOffset + uiSectEndOffset ;
 
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Total size of the ISO Image :%x",uiSectEndOffset);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"Total size of the ISO Image :%x\n", uiSectEndOffset);
 	}
 	else
 		uiSectEndOffset   = BcmGetSectionValEndOffset(Adapter,psFlash2xReadWrite->Section);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "End offset :%x \n",uiSectEndOffset);
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+		"End offset :%x\n", uiSectEndOffset);
 
 	//Checking the boundary condition
 	if((uiSectStartOffset + psFlash2xReadWrite->offset + uiNumOfBytes) <= uiSectEndOffset)
@@ -4605,7 +4725,8 @@ INT	BcmCopySection(PMINI_ADAPTER Adapter,
 		numOfBytes = BcmGetSectionValEndOffset(Adapter,SrcSection)
 				  - BcmGetSectionValStartOffset(Adapter,SrcSection);
 
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL," Section Size :0x%x",numOfBytes);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"Section Size :0x%x\n", numOfBytes);
 	}
 
 	if((offset + numOfBytes) > BcmGetSectionValEndOffset(Adapter,SrcSection)
@@ -4744,13 +4865,16 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
 		sig = ntohl(sig);
 		if((sig & 0xFF000000) != CORRUPTED_PATTERN)
 		{
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Desired pattern is not at sig offset. Hence won't restore");
+			bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+				"Desired pattern is not at sig offset. Hence won't restore\n");
 			Adapter->bSigCorrupted = FALSE;
 			return STATUS_SUCCESS;
 		}
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL," Corrupted sig is :%X", sig);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"Corrupted sig is :%X\n", sig);
 		*((PUINT)(pBuff + offsetToProtect + FIELD_OFFSET_IN_HEADER(PDSD_HEADER,DSDImageMagicNumber)))= htonl(DSD_IMAGE_MAGIC_NUMBER);
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Restoring the signature in Header Write only");
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"Restoring the signature in Header Write only\n");
 		Adapter->bSigCorrupted = FALSE;
 	}
 
@@ -4791,7 +4915,7 @@ static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
 	if(Adapter->SelectedChip == ChipNum)
     		return STATUS_SUCCESS;
 
-	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Selected Chip :%x", ChipNum);
+	//bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Selected Chip :%x\n", ChipNum);
 	Adapter->SelectedChip = ChipNum ;
 
 	//bit[13..12]  will select the appropriate chip
@@ -4861,7 +4985,8 @@ INT ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
 						   SIGNATURE_SIZE);
 
 		uiDSDsig = ntohl(uiDSDsig);
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"DSD SIG :%x", uiDSDsig);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"DSD SIG :%x\n", uiDSDsig);
 
 		return uiDSDsig ;
 }
@@ -4882,7 +5007,8 @@ INT ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
 							   4);
 
 			uiDSDPri = ntohl(uiDSDPri);
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"DSD<%x> Priority :%x", dsd, uiDSDPri);
+			bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+				"DSD<%x> Priority :%x\n", dsd, uiDSDPri);
 
 		}
 	}
@@ -4918,7 +5044,9 @@ FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter)
 		 }
 	}
 	if(HighestPriDSD)
-	 	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Highest DSD :%x , and its  Pri :%x", HighestPriDSD, DSDHighestPri);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"Highest DSD :%x , and its  Pri :%x\n",
+			HighestPriDSD, DSDHighestPri);
 	return  HighestPriDSD ;
 }
 
@@ -4943,7 +5071,8 @@ INT ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso)
 						   SIGNATURE_SIZE);
 
 		uiISOsig = ntohl(uiISOsig);
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"ISO SIG :%x", uiISOsig);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"ISO SIG :%x\n", uiISOsig);
 
 		return uiISOsig ;
 }
@@ -4962,7 +5091,8 @@ INT ReadISOPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso)
 							   4);
 
 			ISOPri = ntohl(ISOPri);
-			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"ISO<%x> Priority :%x", iso, ISOPri);
+			bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+				"ISO<%x> Priority :%x\n", iso, ISOPri);
 
 		}
 	}
@@ -4989,7 +5119,9 @@ FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter)
 		 }
 	}
 	if(HighestPriISO)
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Highest ISO :%x and its Pri :%x",HighestPriISO,ISOHighestPri);
+		bcm_dbg(Adapter, OTHERS, NVM_RW, ALL,
+			"Highest ISO :%x and its Pri :%x\n",
+			HighestPriISO, ISOHighestPri);
 	return	HighestPriISO ;
 }
 INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
@@ -5206,7 +5338,7 @@ static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
 	}
 
 	kfree(pBuff);
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature");
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Corrupted the signature\n");
 	return STATUS_SUCCESS ;
 }
 
@@ -5255,7 +5387,7 @@ static INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
 		return STATUS_FAILURE;
 	}
 
-	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature");
+	bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Corrupted the signature\n");
 	BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,pBuff,MAX_RW_SIZE);
 
 	kfree(pBuff);
diff --git a/drivers/staging/bcm/sort.c b/drivers/staging/bcm/sort.c
index 63c966a..6eaaa8f 100644
--- a/drivers/staging/bcm/sort.c
+++ b/drivers/staging/bcm/sort.c
@@ -24,8 +24,7 @@ static int compare_packet_info(void const *a, void const *b)
 
 VOID SortPackInfo(PMINI_ADAPTER Adapter)
 {
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
-			DBG_LVL_ALL, "<=======");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "<=======\n");
 
 	sort(Adapter->PackInfo, NO_OF_QUEUES, sizeof(PacketInfo),
 		compare_packet_info, NULL);
@@ -44,8 +43,7 @@ static int compare_classifiers(void const *a, void const *b)
 
 VOID SortClassifiers(PMINI_ADAPTER Adapter)
 {
-	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
-			DBG_LVL_ALL, "<=======");
+	bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "<=======\n");
 
 	sort(Adapter->astClassifierTable, MAX_CLASSIFIERS,
 		sizeof(S_CLASSIFIER_RULE), compare_classifiers, NULL);
-- 
1.7.8.111.gad25c.dirty

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel