lkml.org 
[lkml]   [2010]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/7] staging:ft1000: Remove MEDIAMSG typedef usage.
Date
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 ++--
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 e98db30..f88dcf0 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -1836,7 +1836,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
FT1000_INFO *info = (FT1000_INFO *) netdev_priv (dev->net);
u16 msgtype;
u16 tempword;
- PMEDIAMSG pmediamsg;
+ struct media_msg *pmediamsg;
PDSPINITMSG pdspinitmsg;
PDRVMSG pdrvmsg;
u16 i;
@@ -1879,7 +1879,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
case MEDIA_STATE: {
DEBUG("ft1000_proc_drvmsg:Command message type = MEDIA_STATE");

- pmediamsg = (PMEDIAMSG)&cmdbuffer[0];
+ pmediamsg = (struct media_msg *)&cmdbuffer[0];
if (info->ProgConStat != 0xFF) {
if (pmediamsg->state) {
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 ee54372..bfd43fd 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -51,7 +51,7 @@



-typedef struct _MEDIAMSG {
+struct media_msg {
PSEUDO_HDR pseudo;
u16 type;
u16 length;
@@ -61,7 +61,7 @@ typedef struct _MEDIAMSG {
u32 gateway;
u32 dns_1;
u32 dns_2;
-} __attribute__ ((packed)) MEDIAMSG, *PMEDIAMSG;
+} __attribute__ ((packed));

typedef struct _DSPINITMSG {
PSEUDO_HDR pseudo;
@@ -97,7 +97,6 @@ typedef struct _PROV_RECORD {
} PROV_RECORD, *PPROV_RECORD;

/*end of Jim*/
-
#define DEBUG(args...) printk(KERN_INFO args)

#define UCHAR u8
--
1.7.1


\
 
 \ /
  Last update: 2010-10-16 03:47    [W:0.591 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site