---

yaml --- r: 265452 b: refs/heads/master c: ac2bba0 h: refs/heads/master v: v3
git-mirror · Aug 9, 2011 · 87f30b4 · 87f30b4
1 parent 6526a2f
commit 87f30b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: def85c00c97e062995dbf4e979c4bffa8a103b0f
+refs/heads/master: ac2bba019b2b677882d9ea7846a1fdf7c9fd8959
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/sdio.c b/trunk/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -319,8 +319,9 @@ static int ath6kl_sdio_alloc_prep_scat_req(struct ath6kl_sdio *ar_sdio,
 }
 
 /* clean up scatter support */
-static void ath6kl_sdio_cleanup_scat_resource(struct ath6kl_sdio *ar_sdio)
+static void ath6kl_sdio_cleanup_scatter(struct ath6kl *ar)
 {
+	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);
 	struct hif_scatter_req *s_req, *tmp_req;
 	unsigned long flag;
 
@@ -365,7 +366,7 @@ static int ath6kl_sdio_enable_scatter(struct ath6kl *ar,
 					      MAX_SCATTER_REQUESTS, 0);
 	if (ret) {
 		ath6kl_err("hif-scatter: failed to alloc scatter resources !\n");
-		ath6kl_sdio_cleanup_scat_resource(ar_sdio);
+		ath6kl_sdio_cleanup_scatter(ar);
 		return ret;
 	}
 
@@ -657,13 +658,6 @@ static int ath6kl_sdio_async_rw_scatter(struct ath6kl *ar,
 	return status;
 }
 
-static void ath6kl_sdio_cleanup_scatter(struct ath6kl *ar)
-{
-	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);
-
-	ath6kl_sdio_cleanup_scat_resource(ar_sdio);
-}
-
 static const struct ath6kl_hif_ops ath6kl_sdio_ops = {
 	.read_write_sync = ath6kl_sdio_read_write_sync,
 	.write_async = ath6kl_sdio_write_async,