From: Vasanthakumar Thiagarajan Date: Thu, 21 Jul 2011 06:30:49 +0000 (+0530) Subject: ath6kl: Cleanup void *parent_dev in struct wmi X-Git-Tag: v3.2-rc1~129^2~422^2^2~19^2~12 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2865785e96b5990db6928126996fa246d399ec6d;p=~emulex%2Finfiniband.git ath6kl: Cleanup void *parent_dev in struct wmi Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index d574d08f986..1d6294f9da2 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c @@ -1053,7 +1053,7 @@ static int ath6kl_init(struct net_device *dev) /* Indicate that WMI is enabled (although not ready yet) */ set_bit(WMI_ENABLED, &ar->flag); - ar->wmi = ath6kl_wmi_init((void *) ar); + ar->wmi = ath6kl_wmi_init(ar); if (!ar->wmi) { ath6kl_err("failed to initialize wmi\n"); status = -EIO; diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c index 6e4febf2e22..9b06a82cad7 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/drivers/net/wireless/ath/ath6kl/wmi.c @@ -2724,7 +2724,7 @@ static void ath6kl_wmi_qos_state_init(struct wmi *wmi) spin_unlock_bh(&wmi->lock); } -void *ath6kl_wmi_init(void *dev) +void *ath6kl_wmi_init(struct ath6kl *dev) { struct wmi *wmi; diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index bbaa7049f4a..afc9be91408 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.h +++ b/drivers/net/wireless/ath/ath6kl/wmi.h @@ -114,7 +114,7 @@ struct wmi { bool ready; u16 stream_exist_for_ac[WMM_NUM_AC]; u8 fat_pipe_exist; - void *parent_dev; + struct ath6kl *parent_dev; struct wmi_stats stat; struct ath6kl_node_table scan_table; u8 bssid[ETH_ALEN]; @@ -2018,7 +2018,7 @@ int ath6kl_wmi_set_pvb_cmd(struct wmi *wmi, u16 aid, bool flag); int ath6kl_wmi_set_rx_frame_format_cmd(struct wmi *wmi, u8 rx_meta_version, bool rx_dot11_hdr, bool defrag_on_host); -void *ath6kl_wmi_init(void *devt); +void *ath6kl_wmi_init(struct ath6kl *devt); void ath6kl_wmi_shutdown(struct wmi *wmi); #endif /* WMI_H */