---

yaml --- r: 220238 b: refs/heads/master c: 3e26416 h: refs/heads/master v: v3
git-mirror · Oct 8, 2010 · 68f0314 · 68f0314
1 parent e1781c3
commit 68f0314
Show file tree

Hide file tree

Showing 30 changed files with 625 additions and 632 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66cbd3ab35d35580ddf98304c280a6231685aa41
+refs/heads/master: 3e26416e2f7fc2781c084c4ea51227aef30336de
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -186,7 +186,7 @@ u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, u32 addr, int *err)
 	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
 	SDIOH_API_RC status;
 #ifdef SDIOH_API_ACCESS_RETRY_LIMIT
-	int32 retry = 0;
+	s32 retry = 0;
 #endif
 	u8 data = 0;
 
@@ -222,7 +222,7 @@ bcmsdh_cfg_write(void *sdh, uint fnc_num, u32 addr, u8 data, int *err)
 	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
 	SDIOH_API_RC status;
 #ifdef SDIOH_API_ACCESS_RETRY_LIMIT
-	int32 retry = 0;
+	s32 retry = 0;
 #endif
 
 	if (!bcmsdh)

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -404,7 +404,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
 	const bcm_iovar_t *vi = NULL;
 	int bcmerror = 0;
 	int val_size;
-	int32 int_val = 0;
+	s32 int_val = 0;
 	bool bool_val;
 	u32 actionid;
 
@@ -449,7 +449,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
 	actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid);
 	switch (actionid) {
 	case IOV_GVAL(IOV_MSGLEVEL):
-		int_val = (int32) sd_msglevel;
+		int_val = (s32) sd_msglevel;
 		bcopy(&int_val, arg, val_size);
 		break;
 
@@ -458,7 +458,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
 		break;
 
 	case IOV_GVAL(IOV_BLOCKMODE):
-		int_val = (int32) si->sd_blockmode;
+		int_val = (s32) si->sd_blockmode;
 		bcopy(&int_val, arg, val_size);
 		break;
 
@@ -472,7 +472,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
 			bcmerror = BCME_BADARG;
 			break;
 		}
-		int_val = (int32) si->client_block_size[int_val];
+		int_val = (s32) si->client_block_size[int_val];
 		bcopy(&int_val, arg, val_size);
 		break;
 
@@ -519,7 +519,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
 		break;
 
 	case IOV_GVAL(IOV_DMA):
-		int_val = (int32) si->sd_use_dma;
+		int_val = (s32) si->sd_use_dma;
 		bcopy(&int_val, arg, val_size);
 		break;
 
@@ -528,7 +528,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
 		break;
 
 	case IOV_GVAL(IOV_USEINTS):
-		int_val = (int32) si->use_client_ints;
+		int_val = (s32) si->use_client_ints;
 		bcopy(&int_val, arg, val_size);
 		break;
 
@@ -587,12 +587,12 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
 		break;
 
 	case IOV_GVAL(IOV_NUMINTS):
-		int_val = (int32) si->intrcount;
+		int_val = (s32) si->intrcount;
 		bcopy(&int_val, arg, val_size);
 		break;
 
 	case IOV_GVAL(IOV_NUMLOCALINTS):
-		int_val = (int32) 0;
+		int_val = (s32) 0;
 		bcopy(&int_val, arg, val_size);
 		break;
 

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
@@ -995,7 +995,7 @@ int bcm_iovar_lencheck(const bcm_iovar_t *vi, void *arg, int len, bool set)
 	case IOVT_UINT8:
 	case IOVT_UINT16:
 	case IOVT_UINT32:
-		/* all integers are int32 sized args at the ioctl interface */
+		/* all integers are s32 sized args at the ioctl interface */
 		if (len < (int)sizeof(int))
 			bcmerror = BCME_BUFTOOSHORT;
 		break;

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -205,7 +205,7 @@ dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, u32 actionid,
 	    int val_size)
 {
 	int bcmerror = 0;
-	int32 int_val = 0;
+	s32 int_val = 0;
 
 	DHD_TRACE(("%s: Enter\n", __func__));
 
@@ -223,7 +223,7 @@ dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, u32 actionid,
 		break;
 
 	case IOV_GVAL(IOV_MSGLEVEL):
-		int_val = (int32) dhd_msg_level;
+		int_val = (s32) dhd_msg_level;
 		bcopy(&int_val, arg, val_size);
 		break;
 
@@ -238,12 +238,12 @@ dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, u32 actionid,
 		break;
 
 	case IOV_GVAL(IOV_BCMERROR):
-		int_val = (int32) dhd_pub->bcmerror;
+		int_val = (s32) dhd_pub->bcmerror;
 		bcopy(&int_val, arg, val_size);
 		break;
 
 	case IOV_GVAL(IOV_WDTICK):
-		int_val = (int32) dhd_watchdog_ms;
+		int_val = (s32) dhd_watchdog_ms;
 		bcopy(&int_val, arg, val_size);
 		break;
 
@@ -261,7 +261,7 @@ dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, u32 actionid,
 
 #ifdef DHD_DEBUG
 	case IOV_GVAL(IOV_DCONSOLE_POLL):
-		int_val = (int32) dhd_console_ms;
+		int_val = (s32) dhd_console_ms;
 		bcopy(&int_val, arg, val_size);
 		break;
 
@@ -289,7 +289,7 @@ dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, u32 actionid,
 		break;
 
 	case IOV_GVAL(IOV_IOCTLTIMEOUT):{
-			int_val = (int32) dhd_os_get_ioctl_resp_timeout();
+			int_val = (s32) dhd_os_get_ioctl_resp_timeout();
 			bcopy(&int_val, arg, sizeof(int_val));
 			break;
 		}

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1797,7 +1797,7 @@ static int dhd_open(struct net_device *net)
 	u32 toe_ol;
 #endif
 	int ifidx = dhd_net2idx(dhd, net);
-	int32 ret = 0;
+	s32 ret = 0;
 
 	DHD_TRACE(("%s: ifidx %d\n", __func__, ifidx));