Commit 0395a61d authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman

Staging: bcm: Remove typedef for _ST_TIME_ELAPSED_ and call directly.

This patch removes typedef for _ST_TIME_ELAPSED_,
and changes the name of the struct to
bcm_time_elapsed. In addition, any calls
to typedefs ST_TIME_ELAPSED, or *PST_TIME_ELAPSED
are changed to call the struct directly.
Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63df64a2
...@@ -1977,19 +1977,19 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) ...@@ -1977,19 +1977,19 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
break; break;
case IOCTL_BCM_TIME_SINCE_NET_ENTRY: { case IOCTL_BCM_TIME_SINCE_NET_ENTRY: {
ST_TIME_ELAPSED stTimeElapsedSinceNetEntry = {0}; 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"); 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(IOCTL_BUFFER))) if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
return -EFAULT; return -EFAULT;
if (IoBuffer.OutputLength < sizeof(ST_TIME_ELAPSED)) if (IoBuffer.OutputLength < sizeof(struct bcm_time_elapsed))
return -EINVAL; return -EINVAL;
stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = get_seconds() - Adapter->liTimeSinceLastNetEntry; stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = get_seconds() - Adapter->liTimeSinceLastNetEntry;
if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(ST_TIME_ELAPSED))) if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(struct bcm_time_elapsed)))
return -EFAULT; return -EFAULT;
} }
break; break;
......
...@@ -208,10 +208,10 @@ typedef struct _FLASH2X_BITMAP { ...@@ -208,10 +208,10 @@ typedef struct _FLASH2X_BITMAP {
unsigned char Reserved2; unsigned char Reserved2;
} FLASH2X_BITMAP, *PFLASH2X_BITMAP; } FLASH2X_BITMAP, *PFLASH2X_BITMAP;
typedef struct _ST_TIME_ELAPSED_ { struct bcm_time_elapsed {
unsigned long long ul64TimeElapsedSinceNetEntry; unsigned long long ul64TimeElapsedSinceNetEntry;
u32 uiReserved[4]; u32 uiReserved[4];
} ST_TIME_ELAPSED, *PST_TIME_ELAPSED; };
enum { enum {
WIMAX_IDX = 0, /* To access WiMAX chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE */ WIMAX_IDX = 0, /* To access WiMAX chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE */
......
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