---

yaml --- r: 265451 b: refs/heads/master c: def85c0 h: refs/heads/master i: 265449: 396d718 265447: 3a41b6a v: v3
git-mirror · Aug 9, 2011 · 6526a2f · 6526a2f
1 parent c1ae2eb
commit 6526a2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3df505add2e5a370fb04dac1135e751bdd18e08f
+refs/heads/master: def85c00c97e062995dbf4e979c4bffa8a103b0f
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/sdio.c b/trunk/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -342,9 +342,10 @@ static void ath6kl_sdio_cleanup_scat_resource(struct ath6kl_sdio *ar_sdio)
 }
 
 /* setup of HIF scatter resources */
-static int ath6kl_sdio_setup_scat_resource(struct ath6kl_sdio *ar_sdio,
-					   struct hif_dev_scat_sup_info *pinfo)
+static int ath6kl_sdio_enable_scatter(struct ath6kl *ar,
+				      struct hif_dev_scat_sup_info *pinfo)
 {
+	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);
 	int ret = 0;
 
 	/* check if host supports scatter and it meets our requirements */
@@ -626,17 +627,6 @@ static void ath6kl_sdio_scatter_req_add(struct ath6kl *ar,
 
 }
 
-static int ath6kl_sdio_enable_scatter(struct ath6kl *ar,
-				      struct hif_dev_scat_sup_info *info)
-{
-	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);
-	int ret;
-
-	ret = ath6kl_sdio_setup_scat_resource(ar_sdio, info);
-
-	return ret;
-}
-
 /* scatter gather read write request */
 static int ath6kl_sdio_async_rw_scatter(struct ath6kl *ar,
 					struct hif_scatter_req *scat_req)