staging: ft1000-pcmcia: remove MEDIAMSG typedefs

Remove MEDIAMSG typedefs.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
index 472b7371096c38fde760f39d46662ad7de3cf679..e4537e097b264446172af059eab21fd29454e8a8 100644 (file)
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
@@ -292,7 +292,7 @@ struct drv_msg {
        u8  data[0];
 } __attribute__ ((packed));
 
-typedef struct _MEDIAMSG {
+struct media_msg {
        struct pseudo_hdr pseudo;
        u16 type;
        u16 length;
@@ -302,7 +302,7 @@ typedef struct _MEDIAMSG {
        u32 gateway;
        u32 dns_1;
        u32 dns_2;
-} __attribute__ ((packed)) MEDIAMSG, *PMEDIAMSG;
+} __attribute__ ((packed));
 
 typedef struct _TIMEMSG {
        struct pseudo_hdr pseudo;

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 77ce8c408e859b20b840ad067eca5da62fbedee5..ecc5319ef67d6e459b3d28f267ca3ef96aa23568 100644 (file)
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -1015,7 +1015,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
        FT1000_INFO *info = netdev_priv(dev);
        u16 msgtype;
        u16 tempword;
-       PMEDIAMSG pmediamsg;
+       struct media_msg *pmediamsg;
        PDSPINITMSG pdspinitmsg;
        struct drv_msg *pdrvmsg;
        u16 len;
@@ -1090,7 +1090,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
                        info->CardReady = 1;
                        break;
                case MEDIA_STATE:
-                       pmediamsg = (PMEDIAMSG) & cmdbuffer[0];
+                       pmediamsg = (struct media_msg *) & cmdbuffer[0];
                        if (info->ProgConStat != 0xFF) {
                        if (pmediamsg->state) {
                                DEBUG(1, "Media is up\n");