From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <devel@driverdev.osuosl.org>, <gregkh@linuxfoundation.org>,
        <Adham.Abozaeid@microchip.com>, <johannes@sipsolutions.net>,
        <Ajay.Kathat@microchip.com>
Subject: [PATCH 4/9] staging: wilc1000: move macro and function prototype from
 wilc_wlan_if.h file
Thread-Topic: [PATCH 4/9] staging: wilc1000: move macro and function prototype
 from wilc_wlan_if.h file
Thread-Index: AQHUvrXkIzHyd3+Ws02t0nuvEjSpRg==
Date:   Thu, 7 Feb 2019 07:22:32 +0000
Message-ID: <1549519927-2651-5-git-send-email-ajay.kathat@microchip.com>
References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com>
In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.7.4
x-originating-ip: [223.237.230.157]
x-ms-publictraffictype: Email
x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:CH+uyKS35uZJfybc7sG+cxbs8wwTguNpTbGfnfGpGdKvFOMiYESdhxZM3P2aaqO+d816wCRP6WWHX6oUQS7ojiIaXzrIaJ7P3Lik7TaaWrbhh4lYnsNMMNpbzAZ7SsPCPhTA4Lvv5sGA2tFsCZJRCoNBbm49poNiDLG/Js7Ud5GCI1Cez3zRgMsrTM+9NMcHUjJqGtp1y+o+2jS8hGnLdPNrVBsKDy6axi5WfT8bGvZbI5LQS80VrKYJb3E6XDcmNA55aTcaxJ4bF/M55kEjsozjreK6OjNNvib2bNQBMrKWWI5A7E34cyZKIA3Ag/3dTdQEV/aeAwGUS1Q8owL98nbqZ13Df6uKWViIwHZRUHupmklfMDzz9nhENIzBD5Uz7uDGotXFQMKLEL7kjcL5BhKE1yLrkqNujNfPSk+7fF5VXntS1ZUsJBDrnzuL01rVIhg3ulDFVYsffDzGz8/qKQ==;5:kLzTZ0zdG6YBFBwTBQhLaJcsoUu3IVu5MNKEoPkUm2nLr2lJSUhC4VrodxdhmzT2yIHdL8U0o3XP41chUgCNmam5d13+4SMvVvQ4nKydeEod0lPB5V5vkcnXpoE32LOJctXSLusAndq8MmOZjZF3WvyoVu8E+ZrrySl5bQEqR2ectguSKEI622I3x3QnrOqeLssd/1ssvT5dT8zjXF1dZA==;7:EXXViijMIuaaI42aZ8y6GcjjvGbmcBwPzegTvbReYgeeq+LpwEvUsP6JVVRkACAdBfXElV61LbMCjiUDbTqzn0EmLcmUsQtxeTGCNoR2PfQQs2jXJM33frJWTykY7PuYZ6baO6g188AURNRLlmouHQ==
x-ms-office365-filtering-correlation-id: fcc29b09-a994-4fac-544e-08d68ccd0647
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415;
x-ms-traffictypediagnostic: BYAPR11MB3415:
x-microsoft-antispam-prvs: <BYAPR11MB34151EDC05BB798A9EBBCB3DE3680@BYAPR11MB3415.namprd11.prod.outlook.com>
x-forefront-prvs: 0941B96580
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(6506007)(102836004)(386003)(36756003)(71190400001)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4326008)(186003)(68736007)(8936002)(81166006)(107886003)(52116002)(50226002)(53936002)(256004)(6916009)(14444005)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: microchip.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: 2cnhpM7v9IYqgWzswCllX1UmE7Y5cB39wdq/RuNSgOE8V28V9rHnhY8SucphtYw6hn9BHNuMx+ubieMI0SstPMvtbQOxrSMlg8HeGsKva9Wih4QLR4eL3ZQ63CjyT12Fr+omAFEfIHCQdabCkD1PEC7rcgSLuHB/jUfyowaBO4NKUToLii5OqpROADcx70eOBZSXnZ/NR7NLBpMNBsNYBofgMzvVBKVjs+g/PD7CxsaMAwxkpVoMRnxt5Gh06jb5XeS2YDiX+hL4LgTccUjpxyTchaWBjcQKH0lv0HFiFAlNzD1i1l87rlfZF+hG4IP40TzcNck2er4kIYY74x2tDnI0AOreSCTfBbLZ5tnNHMMMcen7wvpcNqXOpxIZrZEUDxmHbjDiBuBppktkkfYQGwOvgd3bqLjqSqlf0GW4MPo=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: fcc29b09-a994-4fac-544e-08d68ccd0647
X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:29.7359
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415
X-OriginatorOrg: microchip.com
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Ajay Singh <ajay.kathat@microchip.com>

Move data structure and function prototype from 'wilc_wlan_if.h file.
Now, this file contains constant specific to the firmware.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/host_interface.c |  1 +
 drivers/staging/wilc1000/host_interface.h | 11 ++++++++++
 drivers/staging/wilc1000/linux_wlan.c     |  2 ++
 drivers/staging/wilc1000/wilc_wlan.h      |  9 ++++++++
 drivers/staging/wilc1000/wilc_wlan_if.h   | 36 ---------------------------=
----
 5 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wi=
lc1000/host_interface.c
index 9abe341..50dc2dd 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -10,6 +10,7 @@
 #define WILC_HIF_CONNECT_TIMEOUT_MS             9500
=20
 #define WILC_FALSE_FRMWR_CHANNEL		100
+#define WILC_MAX_RATES_SUPPORTED		12
=20
 struct wilc_rcvd_mac_info {
 	u8 status;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wi=
lc1000/host_interface.h
index a007625..678e623 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -97,6 +97,17 @@ enum conn_event {
 	CONN_DISCONN_EVENT_FORCE_32BIT		=3D 0xFFFFFFFF
 };
=20
+enum {
+	WILC_HIF_SDIO =3D 0,
+	WILC_HIF_SPI =3D BIT(0)
+};
+
+enum {
+	WILC_MAC_STATUS_INIT =3D -1,
+	WILC_MAC_STATUS_DISCONNECTED =3D 0,
+	WILC_MAC_STATUS_CONNECTED =3D 1
+};
+
 struct wilc_rcvd_net_info {
 	s8 rssi;
 	u8 ch;
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc10=
00/linux_wlan.c
index 8fa5f90..b279811 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -12,6 +12,8 @@
=20
 #include "wilc_wfi_cfgoperations.h"
=20
+#define WILC_MULTICAST_TABLE_SIZE	8
+
 static irqreturn_t isr_uh_routine(int irq, void *user_data)
 {
 	struct net_device *dev =3D user_data;
diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc100=
0/wilc_wlan.h
index d8fabe8..1a27f62 100644
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -250,6 +250,13 @@ struct wilc_hif_func {
=20
 #define WILC_MAX_CFG_FRAME_SIZE		1468
=20
+struct tx_complete_data {
+	int size;
+	void *buff;
+	u8 *bssid;
+	struct sk_buff *skb;
+};
+
 struct wilc_cfg_cmd_hdr {
 	u8 cmd_type;
 	u8 seq_no;
@@ -301,4 +308,6 @@ void chip_allow_sleep(struct wilc *wilc);
 void chip_wakeup(struct wilc *wilc);
 int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids,
 			 u32 count, u32 drv);
+int wilc_wlan_init(struct net_device *dev);
+u32 wilc_get_chipid(struct wilc *wilc, bool update);
 #endif
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc=
1000/wilc_wlan_if.h
index 9b8cce8..b15de36 100644
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -11,41 +11,9 @@
=20
 /********************************************
  *
- *      Host Interface Defines
- *
- ********************************************/
-
-enum {
-	WILC_HIF_SDIO =3D 0,
-	WILC_HIF_SPI =3D BIT(0)
-};
-
-/********************************************
- *
- *      Wlan Interface Defines
- *
- ********************************************/
-
-enum {
-	WILC_MAC_STATUS_INIT =3D -1,
-	WILC_MAC_STATUS_DISCONNECTED =3D 0,
-	WILC_MAC_STATUS_CONNECTED =3D 1
-};
-
-struct tx_complete_data {
-	int size;
-	void *buff;
-	u8 *bssid;
-	struct sk_buff *skb;
-};
-
-/********************************************
- *
  *      Wlan Configuration ID
  *
  ********************************************/
-#define WILC_MULTICAST_TABLE_SIZE	8
-#define WILC_MAX_RATES_SUPPORTED     12
=20
 enum bss_types {
 	WILC_FW_BSS_TYPE_INFRA =3D 0,
@@ -832,8 +800,4 @@ enum {
 	WID_MAX				=3D 0xFFFF
 };
=20
-struct wilc;
-int wilc_wlan_init(struct net_device *dev);
-u32 wilc_get_chipid(struct wilc *wilc, bool update);
-
 #endif
--=20
2.7.4