From e81d907a1a49ee043450959b38b80987bd0fc142 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Fri, 21 Dec 2012 15:10:38 -0500 Subject: [PATCH] --- yaml --- r: 353809 b: refs/heads/master c: a23e67f1a26bef151595cd3373d489683cf1fe80 h: refs/heads/master i: 353807: c44bbdcee46ec5b31810c6cb8b158796cfb1d56f v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/Bcmchar.c | 2 +- trunk/drivers/staging/bcm/Macros.h | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 78a8809cff41..0065c1db915c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c081e78bd41786dc7144757bfa4a7e477cb4da38 +refs/heads/master: a23e67f1a26bef151595cd3373d489683cf1fe80 diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c index fd7c974aff32..b034ace7eacd 100644 --- a/trunk/drivers/staging/bcm/Bcmchar.c +++ b/trunk/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/trunk/drivers/staging/bcm/Macros.h b/trunk/drivers/staging/bcm/Macros.h index 224a15650053..1fae5d9b9d2a 100644 --- a/trunk/drivers/staging/bcm/Macros.h +++ b/trunk/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,