Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 103 deletions
drivers/staging/bcm/Bcmchar.c
View file @ 2c11ca29
...@@ -407,7 +407,8 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, ...@@ -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, 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_wrm_buffer sWrmBuffer = {0};
struct bcm_ioctl_buffer IoBuffer; struct bcm_ioctl_buffer IoBuffer;
...@@ -706,8 +707,8 @@ static int bcm_char_ioctl_gpio_multi_request(void __user *argp, ...@@ -706,8 +707,8 @@ static int bcm_char_ioctl_gpio_multi_request(void __user *argp,
IoBuffer.InputLength)) IoBuffer.InputLength))
return -EFAULT; return -EFAULT;
if (IsReqGpioIsLedInNVM(Adapter, if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_info[WIMAX_IDX].uiGPIOMask)
pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == false) { == false) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
DBG_LVL_ALL, DBG_LVL_ALL,
"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!", "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, ...@@ -823,8 +824,8 @@ static int bcm_char_ioctl_gpio_mode_request(void __user *argp,
} }
/* Validating the request */ /* Validating the request */
if (IsReqGpioIsLedInNVM(Adapter, if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_mode[WIMAX_IDX].uiGPIOMask)
pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) == false) { == false) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, 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>!!!", "Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
pgpio_multi_mode[WIMAX_IDX].uiGPIOMask, pgpio_multi_mode[WIMAX_IDX].uiGPIOMask,
...@@ -932,7 +933,8 @@ static int bcm_char_ioctl_buffer_download_start( ...@@ -932,7 +933,8 @@ static int bcm_char_ioctl_buffer_download_start(
} }
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, 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)) if (down_trylock(&Adapter->fw_download_sema))
return -EBUSY; return -EBUSY;
...@@ -1620,13 +1622,17 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, ...@@ -1620,13 +1622,17 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp,
return -EFAULT; return -EFAULT;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, 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, 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, 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, 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. /* This was internal to driver for raw read.
* now it has ben exposed to user space app. * now it has ben exposed to user space app.
...@@ -1656,7 +1662,8 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, ...@@ -1656,7 +1662,8 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp,
(Adapter->bPreparingForLowPowerMode == TRUE)) { (Adapter->bPreparingForLowPowerMode == TRUE)) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, 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); up(&Adapter->NVMRdmWrmLock);
kfree(pReadBuff); kfree(pReadBuff);
return -EACCES; return -EACCES;
...@@ -1809,7 +1816,9 @@ static int bcm_char_ioctl_flash2x_section_write(void __user *argp, ...@@ -1809,7 +1816,9 @@ static int bcm_char_ioctl_flash2x_section_write(void __user *argp,
/* Writing the data from Flash 2.x */ /* Writing the data from Flash 2.x */
Status = BcmFlash2xBulkWrite(Adapter, (PUINT)pWriteBuff, Status = BcmFlash2xBulkWrite(Adapter, (PUINT)pWriteBuff,
sFlash2xWrite.Section, WriteOffset, WriteBytes, sFlash2xWrite.Section,
WriteOffset,
WriteBytes,
sFlash2xWrite.bVerify); sFlash2xWrite.bVerify);
if (Status) { if (Status) {
...@@ -1962,7 +1971,8 @@ static int bcm_char_ioctl_copy_section(void __user *argp, ...@@ -1962,7 +1971,8 @@ static int bcm_char_ioctl_copy_section(void __user *argp,
sizeof(struct bcm_ioctl_buffer)); sizeof(struct bcm_ioctl_buffer));
if (Status) { if (Status) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, 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; return -EFAULT;
} }
...@@ -2196,8 +2206,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, ...@@ -2196,8 +2206,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp,
(Adapter->bShutStatus == TRUE) || (Adapter->bShutStatus == TRUE) ||
(Adapter->bPreparingForLowPowerMode == TRUE)) { (Adapter->bPreparingForLowPowerMode == TRUE)) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n"); "Device is in Idle/Shutdown Mode\n");
kfree(pReadBuff); kfree(pReadBuff);
up(&Adapter->NVMRdmWrmLock); up(&Adapter->NVMRdmWrmLock);
return -EACCES; return -EACCES;
...@@ -2216,7 +2226,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, ...@@ -2216,7 +2226,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp,
ReadOffset, ReadBytes); ReadOffset, ReadBytes);
if (Status) { if (Status) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, 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; break;
} }
...@@ -2226,7 +2237,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, ...@@ -2226,7 +2237,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp,
Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes); Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
if (Status) { if (Status) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, 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); up(&Adapter->NVMRdmWrmLock);
kfree(pReadBuff); kfree(pReadBuff);
return -EFAULT; return -EFAULT;
...@@ -2262,8 +2274,8 @@ static int bcm_char_ioctl_cntrlmsg_mask(void __user *argp, ...@@ -2262,8 +2274,8 @@ static int bcm_char_ioctl_cntrlmsg_mask(void __user *argp,
if (IoBuffer.InputLength != sizeof(unsigned long)) if (IoBuffer.InputLength != sizeof(unsigned long))
return -EINVAL; return -EINVAL;
Status = copy_from_user(&RxCntrlMsgBitMask, Status = copy_from_user(&RxCntrlMsgBitMask, IoBuffer.InputBuffer,
IoBuffer.InputBuffer, IoBuffer.InputLength); IoBuffer.InputLength);
if (Status) { if (Status) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"copy of control bit mask failed from user space"); "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, ...@@ -2283,8 +2295,8 @@ static int bcm_char_ioctl_get_device_driver_info(void __user *argp,
struct bcm_driver_info DevInfo; struct bcm_driver_info DevInfo;
struct bcm_ioctl_buffer IoBuffer; struct bcm_ioctl_buffer IoBuffer;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n"); "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
memset(&DevInfo, 0, sizeof(DevInfo)); memset(&DevInfo, 0, sizeof(DevInfo));
DevInfo.MaxRDMBufferSize = BUFFER_4K; DevInfo.MaxRDMBufferSize = BUFFER_4K;
...@@ -2584,8 +2596,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) ...@@ -2584,8 +2596,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
return Status; return Status;
case IOCTL_CLOSE_NOTIFICATION: case IOCTL_CLOSE_NOTIFICATION:
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
DBG_LVL_ALL, "IOCTL_CLOSE_NOTIFICATION"); "IOCTL_CLOSE_NOTIFICATION");
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7