staging/bcm: move IOCTL_BCM_REGISTER_WRITE_PRIVATE case out to its own function.
PATCH 2/38 staging/bcm: move IOCTL_BCM_REGISTER_WRITE_PRIVATE case out to its own function.
bcm_char_ioctl is one of the longest non-generated functions in the kernel, at 1906 lines. Splitting it up into multiple functions should simplify this a lot.
Signed-off-by Dave Jones <[email protected]>
--- drivers/staging/bcm/Bcmchar.c | 89 ++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 40 deletions(-)
drivers/staging/bcm/Bcmchar.c +49 -40
@@ -199,6 +199,52 @@ static int bcm_char_ioctl_reg_read_private(void __user *argp, struct bcm_mini_adreturn Status; } +static int bcm_char_ioctl_reg_write_private (void __user *argp,struct bcm_mini_adapter *Adapter) +{ +struct bcm_wrm_buffer sWrmBuffer = {0 }; +struct bcm_ioctl_buffer IoBuffer; +UINT uiTempVar =0 ; +INT Status; + +/* Copy Ioctl Buffer structure */ + +if (copy_from_user (&IoBuffer, argp,sizeof (struct bcm_ioctl_buffer ))) +return -EFAULT ; + +if (IoBuffer.InputLength >sizeof (sWrmBuffer)) +return -EINVAL ; + +/* Get WrmBuffer structure */ +if (copy_from_user (&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength)) +return -EFAULT ; + + uiTempVar = sWrmBuffer.Register &EEPROM_REJECT_MASK ; +if (!((Adapter->pstargetparams->m_u32Customize) &VSG_MODE ) && + ((uiTempVar ==EEPROM_REJECT_REG_1 ) || + (uiTempVar ==EEPROM_REJECT_REG_2 ) || + (uiTempVar ==EEPROM_REJECT_REG_3 ) || + (uiTempVar ==EEPROM_REJECT_REG_4 ))) { + +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_PRINTK ,0 ,0 , +"EEPROM Access Denied, not in VSG Mode\n" ); +return -EFAULT ; + } + + Status =wrmalt (Adapter, (UINT )sWrmBuffer.Register, + (PUINT )sWrmBuffer.Data,sizeof (ULONG )); + +if (Status ==STATUS_SUCCESS ) { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,OSAL_DBG , +DBG_LVL_ALL ,"WRM Done\n" ); + }else { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,OSAL_DBG , +DBG_LVL_ALL ,"WRM Failed\n" ); + Status = -EFAULT ; + } +return Status; +} + +static long bcm_char_ioctl (struct file *filp,UINT cmd,ULONG arg) {struct bcm_tarang_data *pTarang = filp->private_data;
@@ -254,46 +300,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) Status =bcm_char_ioctl_reg_read_private (argp, Adapter);return Status; -case IOCTL_BCM_REGISTER_WRITE_PRIVATE : { -struct bcm_wrm_buffer sWrmBuffer = {0 }; -UINT uiTempVar =0 ; -/* Copy Ioctl Buffer structure */ - -if (copy_from_user (&IoBuffer, argp,sizeof (struct bcm_ioctl_buffer ))) -return -EFAULT ; - -if (IoBuffer.InputLength >sizeof (sWrmBuffer)) -return -EINVAL ; - -/* Get WrmBuffer structure */ -if (copy_from_user (&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength)) -return -EFAULT ; - - uiTempVar = sWrmBuffer.Register &EEPROM_REJECT_MASK ; -if (!((Adapter->pstargetparams->m_u32Customize) &VSG_MODE ) && - ((uiTempVar ==EEPROM_REJECT_REG_1 ) || - (uiTempVar ==EEPROM_REJECT_REG_2 ) || - (uiTempVar ==EEPROM_REJECT_REG_3 ) || - (uiTempVar ==EEPROM_REJECT_REG_4 ))) { - -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_PRINTK ,0 ,0 , -"EEPROM Access Denied, not in VSG Mode\n" ); -return -EFAULT ; - } - - Status =wrmalt (Adapter, (UINT )sWrmBuffer.Register, - (PUINT )sWrmBuffer.Data,sizeof (ULONG )); - -if (Status ==STATUS_SUCCESS ) { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,OSAL_DBG , -DBG_LVL_ALL ,"WRM Done\n" ); - }else { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,OSAL_DBG , -DBG_LVL_ALL ,"WRM Failed\n" ); - Status = -EFAULT ; - } -break ; - } +case IOCTL_BCM_REGISTER_WRITE_PRIVATE : + Status =bcm_char_ioctl_reg_write_private (argp, Adapter); +return Status;case IOCTL_BCM_REGISTER_READ :case IOCTL_BCM_EEPROM_REGISTER_READ : {
Signature · 1 line
1.8.5.3