Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f5157bf authored by Gokulnath A's avatar Gokulnath A Committed by Greg Kroah-Hartman
Browse files

staging:bcm: Removed developer debug prints in InterfaceDld.c 



Removed the developer debug prints BCM_DEBUG_PRINT()
as per the TODO list, also removed braces for the
if-statement to match coding style

Signed-off-by: default avatarGokulnath A <Gokulnath.Avanashilingam@in.bosch.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d3fd5ca

drivers/staging/bcm/InterfaceDld.c

+14 −56
Original line number Diff line number Diff line
@@ -20,18 +20,10 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc) 
			MAX_TRANSFER_CTRL_BYTE_USB, &pos);

		set_fs(oldfs);

		if (len <= 0) {

			if (len < 0) {

				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,

						DBG_TYPE_INITEXIT, MP_INIT,

						DBG_LVL_ALL, "len < 0");

			if (len < 0)

				errno = len;

			} else {

			else

				errno = 0;

				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,

						DBG_TYPE_INITEXIT, MP_INIT,

						DBG_LVL_ALL,

						"Got end of file!");

			}

			break;

		}

		/* BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_INITEXIT, MP_INIT,
@@ -39,12 +31,8 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc) 
		 *			  MAX_TRANSFER_CTRL_BYTE_USB);

		 */

		errno = InterfaceWRM(psIntfAdapter, on_chip_loc, buff, len);

		if (errno) {

			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,

					DBG_TYPE_PRINTK, 0, 0,

					"WRM Failed! status: %d", errno);

		if (errno)

			break;

		}

		on_chip_loc += MAX_TRANSFER_CTRL_BYTE_USB;

	}
@@ -85,27 +73,21 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c 
		fw_down++;



		if (len <= 0) {

			if (len < 0) {

				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "len < 0");

			if (len < 0)

				errno = len;

			} else {

			else

				errno = 0;

				BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Got end of file!");

			}

			break;

		}



		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);

			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);

				Status = -EIO;

				goto exit;

			}
@@ -114,9 +96,6 @@ 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);

					Status = -EIO;

					goto exit;

				}
@@ -160,10 +139,8 @@ static int bcm_download_config_file(struct bcm_mini_adapter *Adapter, struct bcm 
	BcmInitNVM(Adapter);

	retval = InitLedSettings(Adapter);



	if (retval) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "INIT LED Failed\n");

	if (retval)

		return retval;

	}



	if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {

		Adapter->LEDInfo.bLedInitDone = false;
@@ -178,10 +155,8 @@ static int bcm_download_config_file(struct bcm_mini_adapter *Adapter, struct bcm 


	/* 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");

	if (retval)

		return retval;

	}



	value = 0;

	wrmalt(Adapter, EEPROM_CAL_DATA_INTERNAL_LOC - 4, &value, sizeof(value));
@@ -189,11 +164,9 @@ static int bcm_download_config_file(struct bcm_mini_adapter *Adapter, struct bcm 


	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);

		if (retval)

			return retval;

	}

	}



	retval = buffDnldVerify(Adapter, (PUCHAR)Adapter->pstargetparams, sizeof(struct bcm_target_params), CONFIG_BEGIN_ADDR);
@@ -217,7 +190,6 @@ int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_ 
	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");

		return -EINVAL;

	}
@@ -226,14 +198,11 @@ int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_ 
		retval = bcm_download_config_file(Adapter, 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");

		if (buff == NULL)

			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");

			retval = -EFAULT;

			goto error;

		}
@@ -243,11 +212,9 @@ int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_ 
					psFwInfo->u32FirmwareLength,

					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);

		if (retval != STATUS_SUCCESS)

			goto error;

	}

	}



error:

	kfree(buff);
@@ -264,10 +231,8 @@ static INT buffDnld(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, UINT 
		len = MIN_VAL(u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);

		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);

		if (retval)

			break;

		}

		u32StartingAddress += len;

		u32FirmwareLength -= len;

		mappedbuffer += len;
@@ -282,10 +247,8 @@ static INT buffRdbkVerify(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, 
	PUCHAR readbackbuff = kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);

	int bytes;



	if (NULL == readbackbuff) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "MEMORY ALLOCATION FAILED");

	if (NULL == readbackbuff)

		return -ENOMEM;

	}



	while (u32FirmwareLength && !retval) {

		len = MIN_VAL(u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);
@@ -293,7 +256,6 @@ static INT buffRdbkVerify(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, 


		if (bytes < 0) {

			retval = bytes;

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "rdm failed with status %d", retval);

			break;

		}
@@ -317,16 +279,12 @@ INT buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer 
	INT status = STATUS_SUCCESS;



	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");

	if (status != STATUS_SUCCESS)

		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");

	if (status != STATUS_SUCCESS)

		goto error;

	}

error:

	return status;

}