From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Mon, 14 Mar 2011 17:58:56 +0000 (-0700)
Subject: ath6kl: remove-typedef HTC_INIT_INFO
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f0cce96a1c40e3874ac7d3794ad0d36c79fb995;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ath6kl: remove-typedef HTC_INIT_INFO

remove-typedef -s HTC_INIT_INFO \
	"struct htc_init_info" drivers/staging/ath6kl/

Tested-by: Naveen Singh <nsingh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/ath6kl/htc2/htc.c b/drivers/staging/ath6kl/htc2/htc.c
index 2a065b4c4c3f..810fe7b919e6 100644
--- a/drivers/staging/ath6kl/htc2/htc.c
+++ b/drivers/staging/ath6kl/htc2/htc.c
@@ -90,7 +90,7 @@ static void HTCCleanup(HTC_TARGET *target)
 }
 
 /* registered target arrival callback from the HIF layer */
-HTC_HANDLE HTCCreate(void *hif_handle, HTC_INIT_INFO *pInfo)
+HTC_HANDLE HTCCreate(void *hif_handle, struct htc_init_info *pInfo)
 {
     HTC_TARGET              *target = NULL;
     int                 status = 0;
@@ -130,7 +130,7 @@ HTC_HANDLE HTCCreate(void *hif_handle, HTC_INIT_INFO *pInfo)
         target->Device.MessagePendingCallback = HTCRecvMessagePendingHandler;
         target->EpWaitingForBuffers = ENDPOINT_MAX;
 
-        memcpy(&target->HTCInitInfo,pInfo,sizeof(HTC_INIT_INFO));
+        memcpy(&target->HTCInitInfo,pInfo,sizeof(struct htc_init_info));
         
         ResetEndpointStates(target);
           
diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h
index deff62a6cf11..c5727ca60932 100644
--- a/drivers/staging/ath6kl/htc2/htc_internal.h
+++ b/drivers/staging/ath6kl/htc2/htc_internal.h
@@ -132,7 +132,7 @@ typedef struct _HTC_TARGET {
     u8 LastTrailer[256];
     u8 LastTrailerLength;
 #endif
-    HTC_INIT_INFO               HTCInitInfo;
+    struct htc_init_info               HTCInitInfo;
     u8 HTCTargetVersion;
     int                         MaxMsgPerBundle;       /* max messages per bundle for HTC */
     bool                      SendBundlingEnabled;   /* run time enable for send bundling (dynamic) */
diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h
index ad25d3ea40f8..5878417c3443 100644
--- a/drivers/staging/ath6kl/include/htc_api.h
+++ b/drivers/staging/ath6kl/include/htc_api.h
@@ -43,10 +43,10 @@ typedef void *HTC_HANDLE;
 
 typedef u16 HTC_SERVICE_ID;
 
-typedef struct _HTC_INIT_INFO {
+struct htc_init_info {
     void   *pContext;           /* context for target failure notification */
     void   (*TargetFailure)(void *Instance, int Status);
-} HTC_INIT_INFO;
+};
 
 /* per service connection send completion */
 typedef void   (*HTC_EP_SEND_PKT_COMPLETE)(void *,HTC_PACKET *);
@@ -269,7 +269,7 @@ struct htc_endpoint_stats {
   @example:
   @see also: HTCDestroy
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-HTC_HANDLE HTCCreate(void *HifDevice, HTC_INIT_INFO *pInfo);
+HTC_HANDLE HTCCreate(void *HifDevice, struct htc_init_info *pInfo);
 /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   @desc: Get the underlying HIF device handle
   @function name: HTCGetHifDevice
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index b739943d0ab8..ebfe1e8b0f87 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -1599,7 +1599,7 @@ ar6000_avail_ev(void *context, void *hif_handle)
     void *ar_netif;
     AR_SOFTC_T *ar;
     int device_index = 0;
-    HTC_INIT_INFO  htcInfo;
+    struct htc_init_info  htcInfo;
 #ifdef ATH6K_CONFIG_CFG80211
     struct wireless_dev *wdev;
 #endif /* ATH6K_CONFIG_CFG80211 */