Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754076Ab1F3WJQ (ORCPT ); Thu, 30 Jun 2011 18:09:16 -0400 Received: from mail1-out1.atlantis.sk ([80.94.52.55]:33088 "EHLO mail.atlantis.sk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753086Ab1F3WER (ORCPT ); Thu, 30 Jun 2011 18:04:17 -0400 From: Ondrej Zary To: "Greg Kroah-Hartman" Cc: Marek Belisko , Kernel development list Subject: [PATCH 06/28] staging: ft1000-pcmcia: remove DRVMSG typedefs Date: Fri, 1 Jul 2011 00:03:35 +0200 Message-Id: <1309471437-12633-7-git-send-email-linux@rainbow-software.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1309471437-12633-1-git-send-email-linux@rainbow-software.org> References: <1309471437-12633-1-git-send-email-linux@rainbow-software.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3093 Lines: 80 Remove DRVMSG typedefs. Signed-off-by: Ondrej Zary --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/