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

Commit 9e0d6e1a authored by Dave Jones's avatar Dave Jones Committed by Greg Kroah-Hartman
Browse files

staging/bcm: move IOCTL_BCM_SET_ACTIVE_SECTION 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: default avatarDave Jones <davej@fedoraproject.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 338a5c4a

drivers/staging/bcm/Bcmchar.c

+48 −39
Original line number Diff line number Diff line
@@ -1682,6 +1682,51 @@ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_GET_ 
	return Status;

}



static int bcm_char_ioctl_set_active_section(void __user *argp, struct bcm_mini_adapter *Adapter)

{

	enum bcm_flash2x_section_val eFlash2xSectionVal = 0;

	INT Status = STATUS_FAILURE;

	struct bcm_ioctl_buffer IoBuffer;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SET_ACTIVE_SECTION Called");



	if (IsFlash2x(Adapter) != TRUE) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");

		return -EINVAL;

	}



	Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));

	if (Status) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");

		return -EFAULT;

	}



	Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));

	if (Status) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");

		return -EFAULT;

	}



	down(&Adapter->NVMRdmWrmLock);



	if ((Adapter->IdleMode == TRUE) ||

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

		up(&Adapter->NVMRdmWrmLock);

		return -EACCES;

	}



	Status = BcmSetActiveSection(Adapter, eFlash2xSectionVal);

	if (Status)

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Failed to make it's priority Highest. Status %d", Status);



	up(&Adapter->NVMRdmWrmLock);



	return Status;

}





static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)

{
@@ -1891,45 +1936,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		Status = bcm_char_ioctl_flash2x_section_bitmap(argp, Adapter);

		return Status;



	case IOCTL_BCM_SET_ACTIVE_SECTION: {

		enum bcm_flash2x_section_val eFlash2xSectionVal = 0;

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SET_ACTIVE_SECTION Called");



		if (IsFlash2x(Adapter) != TRUE) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");

			return -EINVAL;

		}



		Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));

		if (Status) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");

			return -EFAULT;

		}



		Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));

		if (Status) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");

			return -EFAULT;

		}



		down(&Adapter->NVMRdmWrmLock);



		if ((Adapter->IdleMode == TRUE) ||

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

			up(&Adapter->NVMRdmWrmLock);

			return -EACCES;

		}



		Status = BcmSetActiveSection(Adapter, eFlash2xSectionVal);

		if (Status)

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Failed to make it's priority Highest. Status %d", Status);



		up(&Adapter->NVMRdmWrmLock);

	}

	break;

	case IOCTL_BCM_SET_ACTIVE_SECTION:

		Status = bcm_char_ioctl_set_active_section(argp, Adapter);

		return Status;



	case IOCTL_BCM_IDENTIFY_ACTIVE_SECTION: {

		/* Right Now we are taking care of only DSD */