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

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

staging/bcm: move IOCTL_BCM_TIME_SINCE_NET_ENTRY 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 fe59cefb

drivers/staging/bcm/Bcmchar.c

+24 −18
Original line number Diff line number Diff line
@@ -2029,6 +2029,27 @@ static int bcm_char_ioctl_get_device_driver_info(void __user *argp, struct bcm_m 
	return STATUS_SUCCESS;

}



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

{

	struct bcm_time_elapsed stTimeElapsedSinceNetEntry = {0};

	struct bcm_ioctl_buffer IoBuffer;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_TIME_SINCE_NET_ENTRY called");



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

		return -EFAULT;



	if (IoBuffer.OutputLength < sizeof(struct bcm_time_elapsed))

		return -EINVAL;



	stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = get_seconds() - Adapter->liTimeSinceLastNetEntry;



	if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(struct bcm_time_elapsed)))

		return -EFAULT;



	return STATUS_SUCCESS;

}





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

{
@@ -2036,7 +2057,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
	void __user *argp = (void __user *)arg;

	struct bcm_mini_adapter *Adapter = pTarang->Adapter;

	INT Status = STATUS_FAILURE;

	struct bcm_ioctl_buffer IoBuffer;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

			"Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX",
@@ -2273,23 +2293,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		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};



		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_TIME_SINCE_NET_ENTRY called");



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

			return -EFAULT;



		if (IoBuffer.OutputLength < sizeof(struct bcm_time_elapsed))

			return -EINVAL;



		stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = get_seconds() - Adapter->liTimeSinceLastNetEntry;



		if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(struct bcm_time_elapsed)))

			return -EFAULT;

	}

	break;

	case IOCTL_BCM_TIME_SINCE_NET_ENTRY:

		Status = bcm_char_ioctl_time_since_net_entry(argp, Adapter);

		return Status;



	case IOCTL_CLOSE_NOTIFICATION:

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_CLOSE_NOTIFICATION");