From a76d98497eb5b8f2ad723cfcaa58d6f7653243af Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 18 Jul 2011 23:00:34 -0500 Subject: [PATCH] staging: rtl8192e: Convert typedef cmpk_intr_sta_t to struct cmpk_intr_sta Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/r8192E_cmdpkt.c | 6 +++--- drivers/staging/rtl8192e/r8192E_cmdpkt.h | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/r8192E_cmdpkt.c index 026e3996655a..4ead08dee3f6 100644 --- a/drivers/staging/rtl8192e/r8192E_cmdpkt.c +++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.c @@ -199,14 +199,14 @@ cmpk_handle_interrupt_status( struct net_device *dev, u8* pmsg) { - cmpk_intr_sta_t rx_intr_status; /* */ + struct cmpk_intr_sta rx_intr_status; /* */ struct r8192_priv *priv = rtllib_priv(dev); DMESG("---> cmpk_Handle_Interrupt_Status()\n"); rx_intr_status.length = pmsg[1]; - if (rx_intr_status.length != (sizeof(cmpk_intr_sta_t) - 2)) + if (rx_intr_status.length != (sizeof(struct cmpk_intr_sta) - 2)) { DMESG("cmpk_Handle_Interrupt_Status: wrong length!\n"); return; @@ -416,7 +416,7 @@ cmpk_message_handle_rx( case RX_INTERRUPT_STATUS: RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():RX_INTERRUPT_STATUS\n"); cmpk_handle_interrupt_status(dev, pcmd_buff); - cmd_length = sizeof(cmpk_intr_sta_t); + cmd_length = sizeof(struct cmpk_intr_sta); break; case BOTH_QUERY_CONFIG: RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():BOTH_QUERY_CONFIG\n"); diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.h b/drivers/staging/rtl8192e/r8192E_cmdpkt.h index e3278434b1f1..9e92d7b88fad 100644 --- a/drivers/staging/rtl8192e/r8192E_cmdpkt.h +++ b/drivers/staging/rtl8192e/r8192E_cmdpkt.h @@ -57,13 +57,12 @@ struct cmpk_txfb { u16 duration; /* */ };//; -typedef struct tag_cmd_pkt_interrupt_status -{ +struct cmpk_intr_sta { u8 element_id; u8 length; u16 reserve; u32 interrupt_status; -}cmpk_intr_sta_t; +};//; typedef struct tag_cmd_pkt_set_configuration -- 2.20.1