From: Ondrej Zary <linux@rainbow-software.org>
To: "Greg Kroah-Hartman" <greg@kroah.com>
Cc: Marek Belisko <marek.belisko@gmail.com>,
Kernel development list <linux-kernel@vger.kernel.org>
Subject: [PATCH 06/28] staging: ft1000-pcmcia: remove DRVMSG typedefs
Date: Fri, 1 Jul 2011 00:03:35 +0200 [thread overview]
Message-ID: <1309471437-12633-7-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1309471437-12633-1-git-send-email-linux@rainbow-software.org>
Remove DRVMSG typedefs.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 4 ++--
drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 4 ++--
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
index ca73aa4..472b737 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
@@ -285,12 +285,12 @@ struct pseudo_hdr
#define MAXIMUM_ASIC_HB_CNT 15
-typedef struct _DRVMSG {
+struct drv_msg {
struct pseudo_hdr pseudo;
u16 type;
u16 length;
u8 data[0];
-} __attribute__ ((packed)) DRVMSG, *PDRVMSG;
+} __attribute__ ((packed));
typedef struct _MEDIAMSG {
struct pseudo_hdr pseudo;
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
index 5633c40..0a905a4 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
@@ -328,7 +328,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
PDSP_IMAGE_INFO_V6 pDspImageInfoV6 = NULL;
long requested_version;
BOOLEAN bGoodVersion = 0;
- PDRVMSG pMailBoxData;
+ struct drv_msg *pMailBoxData;
USHORT *pUsData = NULL;
USHORT *pUsFile = NULL;
UCHAR *pUcFile = NULL;
@@ -605,7 +605,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
(long)(info->DSPInfoBlklen + 1) / 2;
put_request_value(dev, word_length);
pMailBoxData =
- (PDRVMSG) & info->DSPInfoBlk[0];
+ (struct drv_msg *) & info->DSPInfoBlk[0];
pUsData =
(USHORT *) & pMailBoxData->data[0];
// Provide mutual exclusive access while reading ASIC registers.
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 5f610e5..77ce8c4 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -1017,7 +1017,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
u16 tempword;
PMEDIAMSG pmediamsg;
PDSPINITMSG pdspinitmsg;
- PDRVMSG pdrvmsg;
+ struct drv_msg *pdrvmsg;
u16 len;
u16 i;
PPROV_RECORD ptr;
@@ -1038,7 +1038,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
if ( ft1000_receive_cmd(dev, &cmdbuffer[0], MAX_CMD_SQSIZE, &tempword) ) {
// Get the message type which is total_len + PSEUDO header + msgtype + message body
- pdrvmsg = (PDRVMSG) & cmdbuffer[0];
+ pdrvmsg = (struct drv_msg *) & cmdbuffer[0];
msgtype = ntohs(pdrvmsg->type);
DEBUG(1, "Command message type = 0x%x\n", msgtype);
switch (msgtype) {
--
Ondrej Zary
next prev parent reply other threads:[~2011-06-30 22:09 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 22:03 [PATCH 00/28] staging: ft1000-pcmcia: various fixes Ondrej Zary
2011-06-30 22:03 ` [PATCH 01/28] staging: ft1000-pcmcia: don't crash on load Ondrej Zary
2011-06-30 22:03 ` [PATCH 02/28] staging: ft1000-pcmcia: fix compilation with FT_DEBUG enabled Ondrej Zary
2011-06-30 22:03 ` [PATCH 03/28] staging: ft1000-pcmcia: delete ft1000.conf Ondrej Zary
2011-06-30 22:03 ` [PATCH 04/28] staging: ft1000-pcmcia: get rid of ft1000_dev.h Ondrej Zary
2011-06-30 22:03 ` [PATCH 05/28] staging: ft1000-pcmcia: remove PSEUDO_HDR typedefs Ondrej Zary
2011-06-30 22:03 ` Ondrej Zary [this message]
2011-06-30 22:03 ` [PATCH 07/28] staging: ft1000-pcmcia: remove MEDIAMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 08/28] staging: ft1000-pcmcia: delete unused TIMEMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 09/28] staging: ft1000-pcmcia: remove DSPINITMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 10/28] staging: ft1000-pcmcia: delete unused DSPHIBERNATE typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 11/28] staging: ft1000-pcmcia: delete unused APP_INFO_BLOCK typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 12/28] staging: ft1000-pcmcia: remove PROV_RECORD typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 13/28] staging: ft1000-pcmcia: remove FT1000_INFO typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 14/28] staging: ft1000-pcmcia: delete unused DPRAM_BLK typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 15/28] staging: ft1000-pcmcia: delete local_info_t typedef Ondrej Zary
2011-06-30 22:03 ` [PATCH 16/28] staging: ft1000-pcmcia: remove firmware download typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 17/28] staging: ft1000-pcmcia: remove unused fields from struct ft1000_info Ondrej Zary
2011-06-30 22:03 ` [PATCH 18/28] staging: ft1000-pcmcia: remove custom defines for standard types Ondrej Zary
2011-06-30 22:03 ` [PATCH 19/28] staging: ft1000-pcmcia: remove useless defines from ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 20/28] staging: ft1000-pcmcia: remove useless debugging " Ondrej Zary
2011-06-30 22:03 ` [PATCH 21/28] staging: ft1000-pcmcia: remove misleading and template comments " Ondrej Zary
2011-06-30 22:03 ` [PATCH 22/28] staging: ft1000-pcmcia: remove unused ft1000_asic_read and ft1000_asic_write functions Ondrej Zary
2011-06-30 22:03 ` [PATCH 23/28] staging: ft1000-pcmcia: coding style fixes in ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 24/28] staging: ft1000-pcmcia: remove unused includes from ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 25/28] staging: ft1000-pcmcia: remove useless ft1000_release() function Ondrej Zary
2011-06-30 22:03 ` [PATCH 26/28] staging: ft1000-pcmcia: CodingStyle fixes in ft1000.h Ondrej Zary
2011-06-30 22:03 ` [PATCH 27/28] staging: ft1000-pcmcia: remove PSEUDOSZ, use sizeof(struct pseudo_hdr) instead Ondrej Zary
2011-06-30 22:03 ` [PATCH 28/28] staging: ft1000-pcmcia: remove support for v5 firmware Ondrej Zary
2011-07-05 17:35 ` [PATCH 00/28] staging: ft1000-pcmcia: various fixes Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309471437-12633-7-git-send-email-linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marek.belisko@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox