Staging: wilc1000: Remove and rename struct typedefs

This patch gets rid of struct typedefs wilc_cfg_byte_t, wilc_cfg_hword_t,
wilc_cfg_word_t and wilc_cfg_str_t as as linux kernel coding style
guidelines suggest not using typdefs for structure types.
Also drop '_t' from the names.

Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c
index 2bb684a3e23bc16d8db99086b6575ae0625e546d..9dab24703b4be6d6884b219b634fab988fd51151 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -44,7 +44,7 @@ typedef struct {
 
 static wilc_mac_cfg_t g_mac;
 
-static wilc_cfg_byte_t g_cfg_byte[] = {
+static struct wilc_cfg_byte g_cfg_byte[] = {
        {WID_BSS_TYPE, 0},
        {WID_CURRENT_TX_RATE, 0},
        {WID_CURRENT_CHANNEL, 0},
@@ -87,7 +87,7 @@ static wilc_cfg_byte_t g_cfg_byte[] = {
        {WID_NIL, 0}
 };
 
-static wilc_cfg_hword_t g_cfg_hword[] = {
+static struct wilc_cfg_hword g_cfg_hword[] = {
        {WID_LINK_LOSS_THRESHOLD, 0},
        {WID_RTS_THRESHOLD, 0},
        {WID_FRAG_THRESHOLD, 0},
@@ -108,7 +108,7 @@ static wilc_cfg_hword_t g_cfg_hword[] = {
        {WID_NIL, 0}
 };
 
-static wilc_cfg_word_t g_cfg_word[] = {
+static struct wilc_cfg_word g_cfg_word[] = {
        {WID_FAILED_COUNT, 0},
        {WID_RETRY_COUNT, 0},
        {WID_MULTIPLE_RETRY_COUNT, 0},
@@ -131,7 +131,7 @@ static wilc_cfg_word_t g_cfg_word[] = {
 
 };
 
-static wilc_cfg_str_t g_cfg_str[] = {
+static struct wilc_cfg_str g_cfg_str[] = {
        {WID_SSID, g_mac.ssid}, /* 33 + 1 bytes */
        {WID_FIRMWARE_VERSION, g_mac.firmware_version},
        {WID_OPERATIONAL_RATE_SET, g_mac.supp_rate},

diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.h b/drivers/staging/wilc1000/wilc_wlan_cfg.h
index 5f74eb83562fae3f585e476d3dd377bd7413de7d..9b74cc326001197751d61ed680f08a08d9ce990f 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.h
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.h
@@ -10,25 +10,25 @@
 #ifndef WILC_WLAN_CFG_H
 #define WILC_WLAN_CFG_H
 
-typedef struct {
+struct wilc_cfg_byte {
        u16 id;
        u16 val;
-} wilc_cfg_byte_t;
+};
 
-typedef struct {
+struct wilc_cfg_hword {
        u16 id;
        u16 val;
-} wilc_cfg_hword_t;
+};
 
-typedef struct {
+struct wilc_cfg_word {
        u32 id;
        u32 val;
-} wilc_cfg_word_t;
+};
 
-typedef struct {
+struct wilc_cfg_str {
        u32 id;
        u8 *str;
-} wilc_cfg_str_t;
+};
 
 struct wilc;
 int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size);