From 6a707a9eb9de373ba3ed2f85d44dce8bda229afc Mon Sep 17 00:00:00 2001 From: Bhumika Goyal Date: Sun, 21 Feb 2016 03:12:11 +0530 Subject: [PATCH] Staging: wilc1000: Remove and rename struct typedefs from .c files Using typedef for a structure type is not suggested in Linux kernel coding style guidelines. So remove typedefs from structures wilc_sdio_t, wilc_spi_t and wilc_mac_cfg_t. Also remove '_t' suffix from the struct names by hand. The following semantic patch detects cases: @tn1@ type td; @@ typedef struct { ... } td; @script:python tf@ td << tn1.td; tdres; @@ coccinelle.tdres = td; @@ type tn1.td; identifier tf.tdres; @@ -typedef struct + tdres { ... } -td ; @@ type tn1.td; identifier tf.tdres; @@ -td + struct tdres Signed-off-by: Bhumika Goyal Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/wilc_sdio.c | 8 ++++---- drivers/staging/wilc1000/wilc_spi.c | 8 ++++---- drivers/staging/wilc1000/wilc_wlan_cfg.c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index 963875afc48f..029bd098da80 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -30,15 +30,15 @@ static const struct sdio_device_id wilc_sdio_ids[] = { #define WILC_SDIO_BLOCK_SIZE 512 -typedef struct { +struct wilc_sdio { bool irq_gpio; u32 block_size; int nint; #define MAX_NUN_INT_THRPT_ENH2 (5) /* Max num interrupts allowed in registers 0xf7, 0xf8 */ int has_thrpt_enh3; -} wilc_sdio_t; +}; -static wilc_sdio_t g_sdio; +static struct wilc_sdio g_sdio; static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data); static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data); @@ -675,7 +675,7 @@ static int sdio_init(struct wilc *wilc, bool resume) u32 chipid; if (!resume) { - memset(&g_sdio, 0, sizeof(wilc_sdio_t)); + memset(&g_sdio, 0, sizeof(struct wilc_sdio)); g_sdio.irq_gpio = wilc->dev_irq_num; } diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c index cfec982b85ef..b55a0c3f6981 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/wilc_spi.c @@ -24,13 +24,13 @@ #include "wilc_wlan.h" #include "wilc_wfi_netdevice.h" -typedef struct { +struct wilc_spi { int crc_off; int nint; int has_thrpt_enh; -} wilc_spi_t; +}; -static wilc_spi_t g_spi; +static struct wilc_spi g_spi; static int wilc_spi_read(struct wilc *wilc, u32, u8 *, u32); static int wilc_spi_write(struct wilc *wilc, u32, u8 *, u32); @@ -861,7 +861,7 @@ static int wilc_spi_init(struct wilc *wilc, bool resume) return 1; } - memset(&g_spi, 0, sizeof(wilc_spi_t)); + memset(&g_spi, 0, sizeof(struct wilc_spi)); /** * configure protocol diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c index 9dab24703b4b..56455f4b65b8 100644 --- a/drivers/staging/wilc1000/wilc_wlan_cfg.c +++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c @@ -19,7 +19,7 @@ * ********************************************/ -typedef struct { +struct wilc_mac_cfg { wilc_debug_func dPrint; int mac_status; @@ -40,9 +40,9 @@ typedef struct { u8 firmware_info[8]; u8 scan_result[256]; u8 scan_result1[256]; -} wilc_mac_cfg_t; +}; -static wilc_mac_cfg_t g_mac; +static struct wilc_mac_cfg g_mac; static struct wilc_cfg_byte g_cfg_byte[] = { {WID_BSS_TYPE, 0}, @@ -349,7 +349,7 @@ static void wilc_wlan_parse_response_frame(u8 *info, int size) static int wilc_wlan_parse_info_frame(u8 *info, int size) { - wilc_mac_cfg_t *pd = &g_mac; + struct wilc_mac_cfg *pd = &g_mac; u32 wid, len; int type = WILC_CFG_RSP_STATUS; @@ -539,7 +539,7 @@ int wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size, int wilc_wlan_cfg_init(wilc_debug_func func) { - memset((void *)&g_mac, 0, sizeof(wilc_mac_cfg_t)); + memset((void *)&g_mac, 0, sizeof(struct wilc_mac_cfg)); g_mac.dPrint = func; return 1; } -- 2.39.5