From: Ondrej Zary <linux@rainbow-software.org>
Date: Thu, 30 Jun 2011 22:03:36 +0000 (+0200)
Subject: staging: ft1000-pcmcia: remove MEDIAMSG typedefs
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24c5b19ed6d4c6ab5993096db721ff3101620435;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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 472b7371096c..e4537e097b26 100644
--- 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 77ce8c408e85..ecc5319ef67d 100644
--- 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");