diff options
| author | Marek Belisko <marek.belisko@gmail.com> | 2010-10-15 14:12:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-15 12:27:04 -0700 |
| commit | 1b8a30121717c04ecd18a8d5f385530e039d7ac2 (patch) | |
| tree | bc260801a379248409a712d2e09b5e79bd38dd7c /drivers/staging | |
| parent | 7dc591159928a0281f946d2b44510ced08f2a13c (diff) | |
| download | linux-1b8a30121717c04ecd18a8d5f385530e039d7ac2.tar.bz2 | |
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')
| -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 2b9131af83f6..0cac0fb83d45 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) { 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; @@ -2126,7 +2126,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 764e9f2eb329..3e33c639a680 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 |