staging: wilc1000: rename 'wilc_mac_cfg' struct to 'wilc_cfg_str_vals'

Rename 'wilc_mac_cfg' struct to 'wilc_cfg_str_vals' as its more
appropriate for structure to store the values of string configuration.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.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 8f1e962d4347f11f60b9a0c1a34f1722a7cbbd5d..930a3896f4ae771b36210e5d527c54c079f951b9 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -438,7 +438,7 @@ void wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size,
 
 int wilc_wlan_cfg_init(struct wilc *wl)
 {
-       struct wilc_mac_cfg *mac_cfg;
+       struct wilc_cfg_str_vals *str_vals;
        int i = 0;
 
        wl->cfg.b = kmemdup(g_cfg_byte, sizeof(g_cfg_byte), GFP_KERNEL);
@@ -457,20 +457,20 @@ int wilc_wlan_cfg_init(struct wilc *wl)
        if (!wl->cfg.s)
                goto out_w;
 
-       mac_cfg = kzalloc(sizeof(mac_cfg), GFP_KERNEL);
-       if (!mac_cfg)
+       str_vals = kzalloc(sizeof(str_vals), GFP_KERNEL);
+       if (!str_vals)
                goto out_s;
 
-       wl->cfg.str_vals = mac_cfg;
+       wl->cfg.str_vals = str_vals;
        /* store the string cfg parameters */
        wl->cfg.s[i].id = WID_FIRMWARE_VERSION;
-       wl->cfg.s[i].str = mac_cfg->firmware_version;
+       wl->cfg.s[i].str = str_vals->firmware_version;
        i++;
        wl->cfg.s[i].id = WID_MAC_ADDR;
-       wl->cfg.s[i].str = mac_cfg->mac_address;
+       wl->cfg.s[i].str = str_vals->mac_address;
        i++;
        wl->cfg.s[i].id = WID_ASSOC_RES_INFO;
-       wl->cfg.s[i].str = mac_cfg->assoc_rsp;
+       wl->cfg.s[i].str = str_vals->assoc_rsp;
        i++;
        wl->cfg.s[i].id = WID_NIL;
        wl->cfg.s[i].str = NULL;

diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.h b/drivers/staging/wilc1000/wilc_wlan_cfg.h
index 176eef1a2bf437648802b698a7615641bf649f49..e5ca6cea0682b657094e72ac5131bb2b5e5a8ddc 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.h
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.h
@@ -27,7 +27,7 @@ struct wilc_cfg_str {
        u8 *str;
 };
 
-struct wilc_mac_cfg {
+struct wilc_cfg_str_vals {
        u8 mac_address[7];
        u8 firmware_version[129];
        u8 assoc_rsp[256];
@@ -38,7 +38,7 @@ struct wilc_cfg {
        struct wilc_cfg_hword *hw;
        struct wilc_cfg_word *w;
        struct wilc_cfg_str *s;
-       struct wilc_mac_cfg *str_vals;
+       struct wilc_cfg_str_vals *str_vals;
 };
 
 struct wilc;