From a5dc3f4de964fcc22e54a1340ef64fe911205428 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Tue, 29 Aug 2017 14:34:33 -0700
Subject: [PATCH] qcacld-3.0: Replace hdd_adapter_t in wlan_hdd_ftm.[ch]

The Linux Coding Style enumerates a few special cases where typedefs
are useful, but stresses "NEVER EVER use a typedef unless you can
clearly match one of those rules." The hdd_adapter_t typedef does not
meet any of those criteria, so replace references to it with a
reference to the underlying struct.

Change-Id: I48952b52777b523d5b383ea4278b8390a4bc4a8e
CRs-Fixed: 2101054
---
 core/hdd/inc/wlan_hdd_ftm.h |  2 +-
 core/hdd/src/wlan_hdd_ftm.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/hdd/inc/wlan_hdd_ftm.h b/core/hdd/inc/wlan_hdd_ftm.h
index f52f84982403..7f19d1c5c2bb 100644
--- a/core/hdd/inc/wlan_hdd_ftm.h
+++ b/core/hdd/inc/wlan_hdd_ftm.h
@@ -47,7 +47,7 @@ int hdd_update_cds_config_ftm(struct hdd_context *hdd_ctx);
 void hdd_ftm_mc_process_msg(void *message);
 #if  defined(QCA_WIFI_FTM)
 QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len);
-int wlan_hdd_qcmbr_unified_ioctl(hdd_adapter_t *adapter, struct ifreq *ifr);
+int wlan_hdd_qcmbr_unified_ioctl(struct hdd_adapter *adapter, struct ifreq *ifr);
 #endif
 
 #endif
diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c
index 408a078ec254..9e76f0e8772d 100644
--- a/core/hdd/src/wlan_hdd_ftm.c
+++ b/core/hdd/src/wlan_hdd_ftm.c
@@ -176,7 +176,7 @@ void hdd_ftm_mc_process_msg(void *message)
  *
  * Return: 0 on success, non-zero on error
  */
-static int wlan_hdd_qcmbr_command(hdd_adapter_t *adapter,
+static int wlan_hdd_qcmbr_command(struct hdd_adapter *adapter,
 				  struct qcmbr_data *pqcmbr_data)
 {
 	int ret = 0;
@@ -236,7 +236,7 @@ static int wlan_hdd_qcmbr_command(hdd_adapter_t *adapter,
  *
  * Return: 0 on success, non-zero on error
  */
-static int wlan_hdd_qcmbr_compat_ioctl(hdd_adapter_t *adapter,
+static int wlan_hdd_qcmbr_compat_ioctl(struct hdd_adapter *adapter,
 				       struct ifreq *ifr)
 {
 	struct qcmbr_data *qcmbr_data;
@@ -262,7 +262,7 @@ exit:
 	return ret;
 }
 #else                           /* CONFIG_COMPAT */
-static int wlan_hdd_qcmbr_compat_ioctl(hdd_adapter_t *adapter,
+static int wlan_hdd_qcmbr_compat_ioctl(struct hdd_adapter *adapter,
 				       struct ifreq *ifr)
 {
 	return 0;
@@ -276,7 +276,7 @@ static int wlan_hdd_qcmbr_compat_ioctl(hdd_adapter_t *adapter,
  *
  * Return: 0 on success, non-zero on error
  */
-static int wlan_hdd_qcmbr_ioctl(hdd_adapter_t *adapter, struct ifreq *ifr)
+static int wlan_hdd_qcmbr_ioctl(struct hdd_adapter *adapter, struct ifreq *ifr)
 {
 	struct qcmbr_data *qcmbr_data;
 	int ret = 0;
@@ -308,7 +308,7 @@ exit:
  *
  * Return: 0 on success, non-zero on error
  */
-int wlan_hdd_qcmbr_unified_ioctl(hdd_adapter_t *adapter, struct ifreq *ifr)
+int wlan_hdd_qcmbr_unified_ioctl(struct hdd_adapter *adapter, struct ifreq *ifr)
 {
 	int ret = 0;