---

yaml --- r: 268471 b: refs/heads/master c: 6760e1b h: refs/heads/master i: 268469: 0181986 268467: f7dcd60 268463: fffa537 v: v3
git-mirror · Sep 16, 2011 · 3a5894f · 3a5894f
1 parent 7a8dd8f
commit 3a5894f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e61a8fd54f458118b908774817a6ba609f1bdd70
+refs/heads/master: 6760e1ba63a1844560fb91e1d55260caf3fac264
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -37,10 +37,6 @@
 
 #define SDIOH_API_ACCESS_RETRY_LIMIT	2
 
-/* Module parameters specific to each host-controller driver */
-
-module_param(sd_f2_blocksize, int, 0);
-
 static void brcmf_sdioh_irqhandler(struct sdio_func *func)
 {
 	struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -40,7 +40,8 @@
 
 #define SDIO_DEVICE_ID_BROADCOM_4329	0x4329
 
-uint sd_f2_blocksize = 512;	/* Default blocksize */
+#define SDIO_FUNC1_BLOCKSIZE		64
+#define SDIO_FUNC2_BLOCKSIZE		512
 
 /* devices we support, null terminated */
 static const struct sdio_device_id brcmf_sdmmc_ids[] = {
@@ -466,19 +467,18 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev)
 	sdiodev->num_funcs = 2;
 
 	sdio_claim_host(sdiodev->func[1]);
-	err_ret = sdio_set_block_size(sdiodev->func[1], 64);
+	err_ret = sdio_set_block_size(sdiodev->func[1], SDIO_FUNC1_BLOCKSIZE);
 	sdio_release_host(sdiodev->func[1]);
 	if (err_ret) {
 		brcmf_dbg(ERROR, "Failed to set F1 blocksize\n");
 		goto out;
 	}
 
 	sdio_claim_host(sdiodev->func[2]);
-	err_ret = sdio_set_block_size(sdiodev->func[2], sd_f2_blocksize);
+	err_ret = sdio_set_block_size(sdiodev->func[2], SDIO_FUNC2_BLOCKSIZE);
 	sdio_release_host(sdiodev->func[2]);
 	if (err_ret) {
-		brcmf_dbg(ERROR, "Failed to set F2 blocksize to %d\n",
-			  sd_f2_blocksize);
+		brcmf_dbg(ERROR, "Failed to set F2 blocksize\n");
 		goto out;
 	}
 

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h
@@ -244,8 +244,6 @@ brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,
 extern void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev,
 				    bool enable);
 
-extern uint sd_f2_blocksize;
-
 extern void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
 				u32 regsva, struct brcmf_sdio_dev *sdiodev);
 extern void brcmf_sdbrcm_disconnect(void *ptr);