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

Commit 2c11ca29 authored by Matthias Beyer's avatar Matthias Beyer Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Indentation fixes in Bcmchar.c 



Signed-off-by: default avatarMatthias Beyer <mail@beyermatthias.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5c34a1a

drivers/staging/bcm/Bcmchar.c

+115 −103
Original line number Diff line number Diff line
@@ -407,7 +407,8 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, 
}



static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,

	struct bcm_mini_adapter *Adapter, UINT cmd)

					   struct bcm_mini_adapter *Adapter,

					   UINT cmd)

{

	struct bcm_wrm_buffer sWrmBuffer = {0};

	struct bcm_ioctl_buffer IoBuffer;
@@ -706,8 +707,8 @@ static int bcm_char_ioctl_gpio_multi_request(void __user *argp, 
			   IoBuffer.InputLength))

		return -EFAULT;



	if (IsReqGpioIsLedInNVM(Adapter,

		pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == false) {

	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>!!!",
@@ -823,8 +824,8 @@ static int bcm_char_ioctl_gpio_mode_request(void __user *argp, 
	}



	/* Validating the request */

	if (IsReqGpioIsLedInNVM(Adapter,

		pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) == false) {

	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,
@@ -932,7 +933,8 @@ static int bcm_char_ioctl_buffer_download_start( 
	}



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

		"Starting the firmware download PID =0x%x!!!!\n", current->pid);

			"Starting the firmware download PID =0x%x!!!!\n",

			current->pid);



	if (down_trylock(&Adapter->fw_download_sema))

		return -EBUSY;
@@ -1620,13 +1622,17 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, 
		return -EFAULT;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

		"\nsFlash2xRead.Section :%x", sFlash2xRead.Section);

			"\nsFlash2xRead.Section :%x",

			sFlash2xRead.Section);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

		"\nsFlash2xRead.offset :%x", sFlash2xRead.offset);

			"\nsFlash2xRead.offset :%x",

			sFlash2xRead.offset);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

		"\nsFlash2xRead.numOfBytes :%x", sFlash2xRead.numOfBytes);

			"\nsFlash2xRead.numOfBytes :%x",

			sFlash2xRead.numOfBytes);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

		"\nsFlash2xRead.bVerify :%x\n", sFlash2xRead.bVerify);

			"\nsFlash2xRead.bVerify :%x\n",

			sFlash2xRead.bVerify);



	/* This was internal to driver for raw read.

	 * now it has ben exposed to user space app.
@@ -1656,7 +1662,8 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, 
		(Adapter->bPreparingForLowPowerMode == TRUE)) {



		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

			DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");

				DBG_LVL_ALL,

				"Device is in Idle/Shutdown Mode\n");

		up(&Adapter->NVMRdmWrmLock);

		kfree(pReadBuff);

		return -EACCES;
@@ -1809,7 +1816,9 @@ static int bcm_char_ioctl_flash2x_section_write(void __user *argp, 


		/* Writing the data from Flash 2.x */

		Status = BcmFlash2xBulkWrite(Adapter, (PUINT)pWriteBuff,

			sFlash2xWrite.Section, WriteOffset, WriteBytes,

					     sFlash2xWrite.Section,

					     WriteOffset,

					     WriteBytes,

					     sFlash2xWrite.bVerify);



		if (Status) {
@@ -1962,7 +1971,8 @@ static int bcm_char_ioctl_copy_section(void __user *argp, 
				sizeof(struct bcm_ioctl_buffer));

	if (Status) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

			"Copy of IOCTL BUFFER failed Status :%d", Status);

				"Copy of IOCTL BUFFER failed Status :%d",

				Status);

		return -EFAULT;

	}
@@ -2196,8 +2206,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, 
		(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_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

				"Device is in Idle/Shutdown Mode\n");

		kfree(pReadBuff);

		up(&Adapter->NVMRdmWrmLock);

		return -EACCES;
@@ -2216,7 +2226,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, 
			ReadOffset, ReadBytes);

		if (Status) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

				"Flash 2x read err with Status :%d", Status);

					"Flash 2x read err with Status :%d",

					Status);

			break;

		}
@@ -2226,7 +2237,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, 
		Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);

		if (Status) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

				"Copy to use failed with status :%d", Status);

					"Copy to use failed with status :%d",

					Status);

			up(&Adapter->NVMRdmWrmLock);

			kfree(pReadBuff);

			return -EFAULT;
@@ -2262,8 +2274,8 @@ static int bcm_char_ioctl_cntrlmsg_mask(void __user *argp, 
	if (IoBuffer.InputLength != sizeof(unsigned long))

		return -EINVAL;



	Status = copy_from_user(&RxCntrlMsgBitMask,

		IoBuffer.InputBuffer, IoBuffer.InputLength);

	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");
@@ -2283,8 +2295,8 @@ static int bcm_char_ioctl_get_device_driver_info(void __user *argp, 
	struct bcm_driver_info DevInfo;

	struct bcm_ioctl_buffer IoBuffer;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

		DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

			"Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");



	memset(&DevInfo, 0, sizeof(DevInfo));

	DevInfo.MaxRDMBufferSize = BUFFER_4K;
@@ -2584,8 +2596,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		return Status;



	case IOCTL_CLOSE_NOTIFICATION:

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

			DBG_LVL_ALL, "IOCTL_CLOSE_NOTIFICATION");

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

				"IOCTL_CLOSE_NOTIFICATION");

		break;



	default: