Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753923Ab1F3WE1 (ORCPT ); Thu, 30 Jun 2011 18:04:27 -0400 Received: from mail1-out1.atlantis.sk ([80.94.52.55]:34790 "EHLO mail.atlantis.sk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752582Ab1F3WER (ORCPT ); Thu, 30 Jun 2011 18:04:17 -0400 From: Ondrej Zary To: "Greg Kroah-Hartman" Cc: Marek Belisko , Kernel development list Subject: [PATCH 09/28] staging: ft1000-pcmcia: remove DSPINITMSG typedefs Date: Fri, 1 Jul 2011 00:03:38 +0200 Message-Id: <1309471437-12633-10-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: 2583 Lines: 69 Remove DSPINITMSG typedefs. Signed-off-by: Ondrej Zary --- drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 4 ++-- drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h index 95ba8c7..f81287b 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h @@ -304,7 +304,7 @@ struct media_msg { u32 dns_2; } __attribute__ ((packed)); -typedef struct _DSPINITMSG { +struct dsp_init_msg { struct pseudo_hdr pseudo; u16 type; u16 length; @@ -315,7 +315,7 @@ typedef struct _DSPINITMSG { u8 ProductMode[MODESZ]; // Product Mode (Market/Production) u8 RfCalVer[CALVERSZ]; // Rf Calibration version u8 RfCalDate[CALDATESZ]; // Rf Calibration date -} __attribute__ ((packed)) DSPINITMSG, *PDSPINITMSG; +} __attribute__ ((packed)); typedef struct _DSPHIBERNATE { 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 ecc5319..949c155 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c @@ -1016,7 +1016,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) u16 msgtype; u16 tempword; struct media_msg *pmediamsg; - PDSPINITMSG pdspinitmsg; + struct dsp_init_msg *pdspinitmsg; struct drv_msg *pdrvmsg; u16 len; u16 i; @@ -1122,7 +1122,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) } break; case DSP_INIT_MSG: - pdspinitmsg = (PDSPINITMSG) & cmdbuffer[0]; + pdspinitmsg = (struct dsp_init_msg *) & cmdbuffer[0]; memcpy(info->DspVer, pdspinitmsg->DspVer, DSPVERSZ); DEBUG(1, "DSPVER = 0x%2x 0x%2x 0x%2x 0x%2x\n", info->DspVer[0], info->DspVer[1], info->DspVer[2], @@ -1139,7 +1139,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) dev->dev_addr[5] = info->eui64[7]; if (ntohs(pdspinitmsg->length) == - (sizeof(DSPINITMSG) - 20)) { + (sizeof(struct dsp_init_msg) - 20)) { memcpy(info->ProductMode, pdspinitmsg->ProductMode, MODESZ); memcpy(info->RfCalVer, pdspinitmsg->RfCalVer, -- 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/