diff options
author | Marek Belisko <marek.belisko@gmail.com> | 2010-10-15 08:12:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-15 15:27:04 -0400 |
commit | 1b8a30121717c04ecd18a8d5f385530e039d7ac2 (patch) | |
tree | bc260801a379248409a712d2e09b5e79bd38dd7c /drivers/staging/ft1000 | |
parent | 7dc591159928a0281f946d2b44510ced08f2a13c (diff) |
staging: ft1000: Remove MEDIAMSG typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000')
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index 2b9131af83f..0cac0fb83d4 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | |||
@@ -2080,7 +2080,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) { | |||
2080 | FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev->net); | 2080 | FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev->net); |
2081 | u16 msgtype; | 2081 | u16 msgtype; |
2082 | u16 tempword; | 2082 | u16 tempword; |
2083 | PMEDIAMSG pmediamsg; | 2083 | struct media_msg *pmediamsg; |
2084 | PDSPINITMSG pdspinitmsg; | 2084 | PDSPINITMSG pdspinitmsg; |
2085 | PDRVMSG pdrvmsg; | 2085 | PDRVMSG pdrvmsg; |
2086 | u16 i; | 2086 | u16 i; |
@@ -2126,7 +2126,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) { | |||
2126 | case MEDIA_STATE: { | 2126 | case MEDIA_STATE: { |
2127 | DEBUG("ft1000_proc_drvmsg:Command message type = MEDIA_STATE"); | 2127 | DEBUG("ft1000_proc_drvmsg:Command message type = MEDIA_STATE"); |
2128 | 2128 | ||
2129 | pmediamsg = (PMEDIAMSG)&cmdbuffer[0]; | 2129 | pmediamsg = (struct media_msg *)&cmdbuffer[0]; |
2130 | if (info->ProgConStat != 0xFF) { | 2130 | if (info->ProgConStat != 0xFF) { |
2131 | if (pmediamsg->state) { | 2131 | if (pmediamsg->state) { |
2132 | DEBUG("Media is up\n"); | 2132 | DEBUG("Media is up\n"); |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h index 764e9f2eb32..3e33c639a68 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | |||
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | 52 | ||
53 | 53 | ||
54 | typedef struct _MEDIAMSG { | 54 | struct media_msg { |
55 | PSEUDO_HDR pseudo; | 55 | PSEUDO_HDR pseudo; |
56 | u16 type; | 56 | u16 type; |
57 | u16 length; | 57 | u16 length; |
@@ -61,7 +61,7 @@ typedef struct _MEDIAMSG { | |||
61 | u32 gateway; | 61 | u32 gateway; |
62 | u32 dns_1; | 62 | u32 dns_1; |
63 | u32 dns_2; | 63 | u32 dns_2; |
64 | } __attribute__ ((packed)) MEDIAMSG, *PMEDIAMSG; | 64 | } __attribute__ ((packed)); |
65 | 65 | ||
66 | typedef struct _DSPINITMSG { | 66 | typedef struct _DSPINITMSG { |
67 | PSEUDO_HDR pseudo; | 67 | PSEUDO_HDR pseudo; |
@@ -97,7 +97,6 @@ typedef struct _PROV_RECORD { | |||
97 | } PROV_RECORD, *PPROV_RECORD; | 97 | } PROV_RECORD, *PPROV_RECORD; |
98 | 98 | ||
99 | /*end of Jim*/ | 99 | /*end of Jim*/ |
100 | |||
101 | #define DEBUG(args...) printk(KERN_INFO args) | 100 | #define DEBUG(args...) printk(KERN_INFO args) |
102 | 101 | ||
103 | #define UCHAR u8 | 102 | #define UCHAR u8 |