From a23e67f1a26bef151595cd3373d489683cf1fe80 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Fri, 21 Dec 2012 15:10:38 -0500
Subject: [PATCH] Staging: bcm: Remove typedef for _LINK_STATE and call
directly.
This patch removes typedef for _LINK_STATE, and changes
the name of the struct to bcm_link_state. In addition,
any calls to struct "LINK_STATE, or PLINK_STATE" are
changed to call directly.
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/bcm/Bcmchar.c | 2 +-
drivers/staging/bcm/Macros.h | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index fd7c974aff32..b034ace7eacd 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1013,7 +1013,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}
case IOCTL_BCM_GET_CURRENT_STATUS: {
- LINK_STATE link_state;
+ struct bcm_link_state link_state;
/* Copy Ioctl Buffer structure */
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
diff --git a/drivers/staging/bcm/Macros.h b/drivers/staging/bcm/Macros.h
index 224a15650053..1fae5d9b9d2a 100644
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
@@ -162,13 +162,11 @@
#define GPIO_MODE_REGISTER 0x0F000034
#define GPIO_PIN_STATE_REGISTER 0x0F000038
-
-typedef struct _LINK_STATE {
+struct bcm_link_state {
UCHAR ucLinkStatus;
UCHAR bIdleMode;
UCHAR bShutdownMode;
-} LINK_STATE, *PLINK_STATE;
-
+};
enum enLinkStatus {
WAIT_FOR_SYNC = 1,
--
2.30.9