staging: ft1000: Remove MEDIAMSG typedef usage. (1b8a3012) · Commits · 戴 / test

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

+2 −2

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -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