summaryrefslogtreecommitdiff
path: root/drivers/staging/bcm
diff options
context:
space:
mode:
authorKevin McKinney <klmckinney1@gmail.com>2012-11-22 19:48:41 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-27 00:05:12 (GMT)
commit0395a61d9151b18866210f070681fd6af362f1a5 (patch)
tree9aaa94f17bec2f22ff0ec53496f9c905ceda02f7 /drivers/staging/bcm
parent63df64a27a42deb75907b411f0e2f5916febc241 (diff)
downloadlinux-fsl-qoriq-0395a61d9151b18866210f070681fd6af362f1a5.tar.xz
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: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r--drivers/staging/bcm/Bcmchar.c6
-rw-r--r--drivers/staging/bcm/Ioctl.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index f376216..6cf1e5b 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1977,19 +1977,19 @@ cntrlEnd:
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;
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 6f112c8..c7c6404 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -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 */