Skip to content

Commit

Permalink
Staging: bcm: Remove typedef for _ST_TIME_ELAPSED_ and call directly.
Browse files Browse the repository at this point in the history
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: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent 63df64a commit 0395a61
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/bcm/Bcmchar.c
Original file line number Diff line number Diff line change
Expand Up @@ -1977,19 +1977,19 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
break;

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

if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
return -EFAULT;

if (IoBuffer.OutputLength < sizeof(ST_TIME_ELAPSED))
if (IoBuffer.OutputLength < sizeof(struct bcm_time_elapsed))
return -EINVAL;

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;
}
break;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/bcm/Ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ typedef struct _FLASH2X_BITMAP {
unsigned char Reserved2;
} FLASH2X_BITMAP, *PFLASH2X_BITMAP;

typedef struct _ST_TIME_ELAPSED_ {
struct bcm_time_elapsed {
unsigned long long ul64TimeElapsedSinceNetEntry;
u32 uiReserved[4];
} ST_TIME_ELAPSED, *PST_TIME_ELAPSED;
};

enum {
WIMAX_IDX = 0, /* To access WiMAX chip GPIO's for GPIO_MULTI_INFO or GPIO_MULTI_MODE */
Expand Down

0 comments on commit 0395a61

Please sign in to comment.