Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24c5b19e authored by Ondrej Zary's avatar Ondrej Zary Committed by Greg Kroah-Hartman
Browse files

staging: ft1000-pcmcia: remove MEDIAMSG typedefs 



Remove MEDIAMSG typedefs.

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8bc0d6fb

drivers/staging/ft1000/ft1000-pcmcia/ft1000.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -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");