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

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

staging/bcm: move IOCTL_BCM_GET_DEVICE_DRIVER_INFO 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 8f7e14ee

drivers/staging/bcm/Bcmchar.c

+29 −22
Original line number Diff line number Diff line
@@ -2003,6 +2003,32 @@ static int bcm_char_ioctl_cntrlmsg_mask(void __user *argp, struct bcm_mini_adapt 
	return Status;

}



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

{

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



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

	DevInfo.MaxRDMBufferSize = BUFFER_4K;

	DevInfo.u32DSDStartOffset = EEPROM_CALPARAM_START;

	DevInfo.u32RxAlignmentCorrection = 0;

	DevInfo.u32NVMType = Adapter->eNVMType;

	DevInfo.u32InterfaceType = BCM_USB;



	if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))

		return -EFAULT;



	if (IoBuffer.OutputLength < sizeof(DevInfo))

		return -EINVAL;



	if (copy_to_user(IoBuffer.OutputBuffer, &DevInfo, sizeof(DevInfo)))

		return -EFAULT;



	return STATUS_SUCCESS;

}





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

{
@@ -2243,28 +2269,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		Status = bcm_char_ioctl_cntrlmsg_mask(argp, Adapter, pTarang);

		return Status;



	case IOCTL_BCM_GET_DEVICE_DRIVER_INFO: {

		struct bcm_driver_info DevInfo;



		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;

		DevInfo.u32DSDStartOffset = EEPROM_CALPARAM_START;

		DevInfo.u32RxAlignmentCorrection = 0;

		DevInfo.u32NVMType = Adapter->eNVMType;

		DevInfo.u32InterfaceType = BCM_USB;



		if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))

			return -EFAULT;



		if (IoBuffer.OutputLength < sizeof(DevInfo))

			return -EINVAL;



		if (copy_to_user(IoBuffer.OutputBuffer, &DevInfo, sizeof(DevInfo)))

			return -EFAULT;

	}

	break;

	case IOCTL_BCM_GET_DEVICE_DRIVER_INFO:

		Status = bcm_char_ioctl_get_device_driver_info(argp, Adapter);

		return Status;



	case IOCTL_BCM_TIME_SINCE_NET_ENTRY: {

		struct bcm_time_elapsed stTimeElapsedSinceNetEntry = {0};