Skip to contentSkip to conversation

staging: rtl8188eu: Remove unused function rtw_change_ifname()

PATCH In review navin patidar 2 participants 14 messages Jul 7, 2014 – Jul 8, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/13 staging: rtl8188eu: Remove unused function rtw_change_ifname()

---
 drivers/staging/rtl8188eu/include/rtw_ioctl_set.h |    1 -
 drivers/staging/rtl8188eu/os_dep/osdep_service.c  |   55 ---------------------
 2 files changed, 56 deletions(-)
drivers/staging/rtl8188eu/include/rtw_ioctl_set.h +0 -1
index 187fe1f..005ec17 100644
@@ -45,6 +45,5 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter);
 int rtw_set_scan_mode(struct adapter *adapter, enum rt_scan_type scan_mode);
 int rtw_set_channel_plan(struct adapter *adapter, u8 channel_plan);
 int rtw_set_country(struct adapter *adapter, const char *country_code);
-int rtw_change_ifname(struct adapter *padapter, const char *ifname);
 
 #endif
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -55

61 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/13 staging: rtl8188eu: Remove function rtw_alloc_etherdev()

rtw_alloc_etherdev() is used in rtw_init_netdev() but never gets called because old_padapter is never NULL.

---
 drivers/staging/rtl8188eu/include/osdep_service.h |    1 -
 drivers/staging/rtl8188eu/os_dep/os_intfs.c       |    4 +---
 drivers/staging/rtl8188eu/os_dep/osdep_service.c  |   23 ---------------------
 3 files changed, 1 insertion(+), 27 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
index 95131fe..a52dcd5 100644
@@ -164,7 +164,6 @@ struct rtw_netdev_priv_indicator {
 };
 struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,
 						    void *old_priv);
-struct net_device *rtw_alloc_etherdev(int sizeof_priv);
 
 #define rtw_netdev_priv(netdev)					\
 	(((struct rtw_netdev_priv_indicator *)netdev_priv(netdev))->priv)
drivers/staging/rtl8188eu/os_dep/os_intfs.c +1 -3
index b0c38a4..c7a44ab 100644
@@ -707,14 +707,12 @@ static const struct device_type wlan_type = {
 struct net_device *rtw_init_netdev(struct adapter *old_padapter)
 {
 	struct adapter *padapter;
-	struct net_device *pnetdev;
+	struct net_device *pnetdev = NULL;
 
 	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+init_net_dev\n"));
 
 	if (old_padapter != NULL)
 		pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(struct adapter), (void *)old_padapter);
-	else
-		pnetdev = rtw_alloc_etherdev(sizeof(struct adapter));
 
 	if (!pnetdev)
 		return NULL;
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -23
index 76eddcd..93c76d7 100644
@@ -111,29 +111,6 @@ RETURN:
 	return pnetdev;
 }
 
-struct net_device *rtw_alloc_etherdev(int sizeof_priv)
-{
-	struct net_device *pnetdev;
-	struct rtw_netdev_priv_indicator *pnpi;
-
-	pnetdev = alloc_etherdev_mq(sizeof(struct rtw_netdev_priv_indicator), 4);
-	if (!pnetdev)
-		goto RETURN;
-
-	pnpi = netdev_priv(pnetdev);
-
-	pnpi->priv = vzalloc(sizeof_priv);
-	if (!pnpi->priv) {
-		free_netdev(pnetdev);
-		pnetdev = NULL;
-		goto RETURN;
-	}
-
-	pnpi->sizeof_priv = sizeof_priv;
-RETURN:
-	return pnetdev;
-}
-
 void rtw_free_netdev(struct net_device *netdev)
 {
 	struct rtw_netdev_priv_indicator *pnpi;
Signature · 1 line
1.7.10.4
#2 lore raw

Re: [PATCH 02/13] staging: rtl8188eu: Remove function rtw_alloc_etherdev()

Quoted 27 lines · navin patidar

rtw_alloc_etherdev() is used in rtw_init_netdev() but never gets called because old_padapter is never NULL.

---
 drivers/staging/rtl8188eu/include/osdep_service.h |    1 -
 drivers/staging/rtl8188eu/os_dep/os_intfs.c       |    4 +---
 drivers/staging/rtl8188eu/os_dep/osdep_service.c  |   23 ---------------------
 3 files changed, 1 insertion(+), 27 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
index 95131fe..a52dcd5 100644
@@ -164,7 +164,6 @@ struct rtw_netdev_priv_indicator {
 };
 struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,
 						    void *old_priv);
-struct net_device *rtw_alloc_etherdev(int sizeof_priv);
 
 #define rtw_netdev_priv(netdev)					\
 	(((struct rtw_netdev_priv_indicator *)netdev_priv(netdev))->priv)
drivers/staging/rtl8188eu/os_dep/os_intfs.c +0 -0
index b0c38a4..c7a44ab 100644

drivers/staging/rtl8188eu/os_dep/os_intfs.c static const struct device_type wlan_type = { · line 715

Quoted 10 lines
drivers/staging/rtl8188eu/os_dep/os_intfs.c +1 -1
@@ -707,14 +707,12 @@ static const struct device_type wlan_type = {
 struct net_device *rtw_init_netdev(struct adapter *old_padapter)
 {
 	struct adapter *padapter;
-	struct net_device *pnetdev;
+	struct net_device *pnetdev = NULL;
 
 	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+init_net_dev\n"));
 
 	if (old_padapter != NULL)
 		pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(struct adapter), (void *)old_padapter);

Next time just remove the pointless NULL check as well. It still falls under the one thing per patch rule because it's closely related. It makes the code more clear and it even makes the patch easier to review.

drivers/staging/rtl8188eu/os_dep/os_intfs.c static const struct device_type wlan_type = { · line 716

Quoted 3 lines
drivers/staging/rtl8188eu/os_dep/os_intfs.c +0 -2
-	else
-		pnetdev = rtw_alloc_etherdev(sizeof(struct adapter));
 

regards,
dan carpenter

#3 lore raw

PATCH 3/13 staging: rtl8188eu: Remove unused function efuse_GetCurrentSize()

In reply to navin patidar
---
 drivers/staging/rtl8188eu/core/rtw_efuse.c    |    9 ---------
 drivers/staging/rtl8188eu/include/rtw_efuse.h |    1 -
 2 files changed, 10 deletions(-)
drivers/staging/rtl8188eu/core/rtw_efuse.c +0 -9
index 82a54b5..0e20d5c 100644
@@ -1042,15 +1042,6 @@ u16 efuse_GetMaxSize(struct adapter *padapter)
 	return max_size;
 }
 
-u8 efuse_GetCurrentSize(struct adapter *padapter, u16 *size)
-{
-	Efuse_PowerSwitch(padapter, false, true);
-	*size = Efuse_GetCurrentSize(padapter);
-	Efuse_PowerSwitch(padapter, false, false);
-
-	return _SUCCESS;
-}
-
 u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
 {
 	u16 mapLen = 0;
drivers/staging/rtl8188eu/include/rtw_efuse.h +0 -1
index b608b92..6b56501 100644
@@ -99,7 +99,6 @@ struct efuse_hal {
 	u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN];
 };
 
-u8 efuse_GetCurrentSize(struct adapter *adapter, u16 *size);
 u16 efuse_GetMaxSize(struct adapter *adapter);
 u8 rtw_efuse_access(struct adapter *adapter, u8 read, u16 start_addr,
 		    u16 cnts, u8 *data);
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH 4/13 staging: rtl8188eu: Remove unused function efuse_GetMaxSize()

In reply to navin patidar
---
 drivers/staging/rtl8188eu/core/rtw_efuse.c    |    7 -------
 drivers/staging/rtl8188eu/include/rtw_efuse.h |    1 -
 2 files changed, 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_efuse.c +0 -7
index 0e20d5c..ede7708 100644
@@ -1035,13 +1035,6 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 write, u16 start_addr, u16 cnts
 	return res;
 }
 
-u16 efuse_GetMaxSize(struct adapter *padapter)
-{
-	u16 max_size;
-	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size);
-	return max_size;
-}
-
 u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
 {
 	u16 mapLen = 0;
drivers/staging/rtl8188eu/include/rtw_efuse.h +0 -1
index 6b56501..86a1832 100644
@@ -99,7 +99,6 @@ struct efuse_hal {
 	u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN];
 };
 
-u16 efuse_GetMaxSize(struct adapter *adapter);
 u8 rtw_efuse_access(struct adapter *adapter, u8 read, u16 start_addr,
 		    u16 cnts, u8 *data);
 u8 rtw_efuse_map_read(struct adapter *adapter, u16 addr, u16 cnts, u8 *data);

--
1.7.10.4

#5 lore raw

PATCH 5/13 staging: rtl8188eu: rtw_efuse.c : Remove unused functions

In reply to navin patidar
---
 drivers/staging/rtl8188eu/core/rtw_efuse.c    |   49 -------------------------
 drivers/staging/rtl8188eu/include/rtw_efuse.h |    2 -
 2 files changed, 51 deletions(-)
drivers/staging/rtl8188eu/core/rtw_efuse.c +0 -49
index ede7708..2189183 100644
@@ -982,58 +982,9 @@ void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata)
 	}
 }
 
-static u8 efuse_read8(struct adapter *padapter, u16 address, u8 *value)
-{
-	return efuse_OneByteRead(padapter, address, value);
-}
-
-static u8 efuse_write8(struct adapter *padapter, u16 address, u8 *value)
-{
-	return efuse_OneByteWrite(padapter, address, *value);
-}
-
 /*
  * read/wirte raw efuse data
  */
-u8 rtw_efuse_access(struct adapter *padapter, u8 write, u16 start_addr, u16 cnts, u8 *data)
-{
-	int i = 0;
-	u16 real_content_len = 0, max_available_size = 0;
-	u8 res = _FAIL;
-	u8 (*rw8)(struct adapter *, u16, u8*);
-
-	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len);
-	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);
-
-	if (start_addr > real_content_len)
-		return _FAIL;
-
-	if (write) {
-		if ((start_addr + cnts) > max_available_size)
-			return _FAIL;
-		rw8 = &efuse_write8;
-	} else {
-		rw8 = &efuse_read8;
-	}
-
-	Efuse_PowerSwitch(padapter, write, true);
-
-	/*  e-fuse one byte read / write */
-	for (i = 0; i < cnts; i++) {
-		if (start_addr >= real_content_len) {
-			res = _FAIL;
-			break;
-		}
-
-		res = rw8(padapter, start_addr++, data++);
-		if (_FAIL == res)
-			break;
-	}
-
-	Efuse_PowerSwitch(padapter, write, false);
-
-	return res;
-}
 
 u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
 {
drivers/staging/rtl8188eu/include/rtw_efuse.h +0 -2
index 86a1832..6d20fcc 100644
@@ -99,8 +99,6 @@ struct efuse_hal {
 	u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN];
 };
 
-u8 rtw_efuse_access(struct adapter *adapter, u8 read, u16 start_addr,
-		    u16 cnts, u8 *data);
 u8 rtw_efuse_map_read(struct adapter *adapter, u16 addr, u16 cnts, u8 *data);
 u8 rtw_efuse_map_write(struct adapter *adapter, u16 addr, u16 cnts, u8 *data);
 u16 Efuse_GetCurrentSize(struct adapter *adapter);
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH 6/13 staging: rtl8188eu: Remove unused functions rtw_efuse_map_[read,write]()

In reply to navin patidar
---
 drivers/staging/rtl8188eu/core/rtw_efuse.c    |  113 -------------------------
 drivers/staging/rtl8188eu/include/rtw_efuse.h |    2 -
 2 files changed, 115 deletions(-)
drivers/staging/rtl8188eu/core/rtw_efuse.c +0 -113
index 2189183..df8d934 100644
@@ -983,119 +983,6 @@ void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata)
 }
 
 /*
- * read/wirte raw efuse data
- */
-
-u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
-{
-	u16 mapLen = 0;
-
-	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);
-
-	if ((addr + cnts) > mapLen)
-		return _FAIL;
-
-	Efuse_PowerSwitch(padapter, false, true);
-
-	efuse_ReadEFuse(padapter, EFUSE_WIFI, addr, cnts, data);
-
-	Efuse_PowerSwitch(padapter, false, false);
-
-	return _SUCCESS;
-}
-
-u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
-{
-	u8 offset, word_en;
-	u8 *map;
-	u8 newdata[PGPKT_DATA_SIZE + 1];
-	s32	i, idx;
-	u8 ret = _SUCCESS;
-	u16 mapLen = 0;
-
-	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);
-
-	if ((addr + cnts) > mapLen)
-		return _FAIL;
-
-	map = kzalloc(mapLen, GFP_KERNEL);
-	if (map == NULL)
-		return _FAIL;
-
-	ret = rtw_efuse_map_read(padapter, 0, mapLen, map);
-	if (ret == _FAIL)
-		goto exit;
-
-	Efuse_PowerSwitch(padapter, true, true);
-
-	offset = (addr >> 3);
-	word_en = 0xF;
-	memset(newdata, 0xFF, PGPKT_DATA_SIZE + 1);
-	i = addr & 0x7;	/*  index of one package */
-	idx = 0;	/*  data index */
-
-	if (i & 0x1) {
-		/*  odd start */
-		if (data[idx] != map[addr+idx]) {
-			word_en &= ~BIT(i >> 1);
-			newdata[i-1] = map[addr+idx-1];
-			newdata[i] = data[idx];
-		}
-		i++;
-		idx++;
-	}
-	do {
-		for (; i < PGPKT_DATA_SIZE; i += 2) {
-			if (cnts == idx)
-				break;
-			if ((cnts - idx) == 1) {
-				if (data[idx] != map[addr+idx]) {
-					word_en &= ~BIT(i >> 1);
-					newdata[i] = data[idx];
-					newdata[i+1] = map[addr+idx+1];
-				}
-				idx++;
-				break;
-			} else {
-				if ((data[idx] != map[addr+idx]) ||
-				    (data[idx+1] != map[addr+idx+1])) {
-					word_en &= ~BIT(i >> 1);
-					newdata[i] = data[idx];
-					newdata[i+1] = data[idx + 1];
-				}
-				idx += 2;
-			}
-			if (idx == cnts)
-				break;
-		}
-
-		if (word_en != 0xF) {
-			ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata);
-			DBG_88E("offset=%x\n", offset);
-			DBG_88E("word_en=%x\n", word_en);
-
-			for (i = 0; i < PGPKT_DATA_SIZE; i++)
-				DBG_88E("data=%x \t", newdata[i]);
-			if (ret == _FAIL)
-				break;
-		}
-
-		if (idx == cnts)
-			break;
-
-		offset++;
-		i = 0;
-		word_en = 0xF;
-		memset(newdata, 0xFF, PGPKT_DATA_SIZE);
-	} while (1);
-
-	Efuse_PowerSwitch(padapter, true, false);
-exit:
-	kfree(map);
-	return ret;
-}
-
-/*
  * Function:   efuse_ShadowRead1Byte
  *             efuse_ShadowRead2Byte
  *             efuse_ShadowRead4Byte
drivers/staging/rtl8188eu/include/rtw_efuse.h +0 -2
index 6d20fcc..adeb501 100644
@@ -99,8 +99,6 @@ struct efuse_hal {
 	u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN];
 };
 
-u8 rtw_efuse_map_read(struct adapter *adapter, u16 addr, u16 cnts, u8 *data);
-u8 rtw_efuse_map_write(struct adapter *adapter, u16 addr, u16 cnts, u8 *data);
 u16 Efuse_GetCurrentSize(struct adapter *adapter);
 u8 Efuse_CalculateWordCnts(u8 word_en);
 void EFUSE_GetEfuseDefinition(struct adapter *adapt, u8 type, u8 type1,
Signature · 1 line
1.7.10.4
#7 lore raw

PATCH 7/13 staging: rtl8188eu: Remove unused function HalDetectPwrDownMode88E()

In reply to navin patidar
---
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c |   19 -------------------
 drivers/staging/rtl8188eu/include/rtl8188e_hal.h  |    2 --
 2 files changed, 21 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -19
index 1abf974..161138f 100644
@@ -1079,25 +1079,6 @@ void Hal_ReadThermalMeter_88E(struct adapter *Adapter, u8 *PROMContent, bool Aut
 	DBG_88E("ThermalMeter = 0x%x\n", pHalData->EEPROMThermalMeter);
 }
 
-bool HalDetectPwrDownMode88E(struct adapter *Adapter)
-{
-	u8 tmpvalue = 0;
-	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
-	struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;
-
-	EFUSE_ShadowRead(Adapter, 1, EEPROM_RF_FEATURE_OPTION_88E, (u32 *)&tmpvalue);
-
-	/*  2010/08/25 MH INF priority > PDN Efuse value. */
-	if (tmpvalue & BIT(4) && pwrctrlpriv->reg_pdnmode)
-		pHalData->pwrdown = true;
-	else
-		pHalData->pwrdown = false;
-
-	DBG_88E("HalDetectPwrDownMode(): PDN =%d\n", pHalData->pwrdown);
-
-	return pHalData->pwrdown;
-}	/*  HalDetectPwrDownMode */
-
 /*  This function is used only for 92C to set REG_BCN_CTRL(0x550) register. */
 /*  We just reserve the value of the register in variable pHalData->RegBcnCtrlVal and then operate */
 /*  the value of the register via atomic operation. */
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +0 -2
index a0a3ca7..4b7b069 100644
@@ -451,8 +451,6 @@ void Hal_EfuseParseBoardType88E(struct adapter *pAdapter, u8 *hwinfo,
 void Hal_ReadPowerSavingMode88E(struct adapter *pAdapter, u8 *hwinfo,
 				bool AutoLoadFail);
 
-bool HalDetectPwrDownMode88E(struct adapter *Adapter);
-
 void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc);
 
 /*  register */
Signature · 1 line
1.7.10.4
#8 lore raw

PATCH 8/13 staging: rtl8188eu: rtw_efuse.c: Remove unused functions

In reply to navin patidar
---
 drivers/staging/rtl8188eu/core/rtw_efuse.c    |   60 -------------------------
 drivers/staging/rtl8188eu/include/rtw_efuse.h |    2 -
 2 files changed, 62 deletions(-)
drivers/staging/rtl8188eu/core/rtw_efuse.c +0 -60
index df8d934..5b997b2 100644
@@ -983,53 +983,6 @@ void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata)
 }
 
 /*
- * Function:   efuse_ShadowRead1Byte
- *             efuse_ShadowRead2Byte
- *             efuse_ShadowRead4Byte
- *
- * Overview:   Read from efuse init map by one/two/four bytes !!!!!
- */
-static void
-efuse_ShadowRead1Byte(
-		struct adapter *pAdapter,
-		u16 Offset,
-		u8 *Value)
-{
-	struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
-
-	*Value = pEEPROM->efuse_eeprom_data[Offset];
-
-}
-
-static void
-efuse_ShadowRead2Byte(
-		struct adapter *pAdapter,
-		u16 Offset,
-		u16 *Value)
-{
-	struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
-
-	*Value = pEEPROM->efuse_eeprom_data[Offset];
-	*Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8;
-
-}
-
-static void
-efuse_ShadowRead4Byte(
-		struct adapter *pAdapter,
-		u16 Offset,
-		u32 *Value)
-{
-	struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
-
-	*Value = pEEPROM->efuse_eeprom_data[Offset];
-	*Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8;
-	*Value |= pEEPROM->efuse_eeprom_data[Offset+2]<<16;
-	*Value |= pEEPROM->efuse_eeprom_data[Offset+3]<<24;
-
-}
-
-/*
  * Overview:	Read All Efuse content
  */
 static void Efuse_ReadAllMap(struct adapter *pAdapter, u8 efuseType, u8 *Efuse)
@@ -1062,16 +1015,3 @@ void EFUSE_ShadowMapUpdate(
 	else
 		Efuse_ReadAllMap(pAdapter, efuseType, pEEPROM->efuse_eeprom_data);
 }
-
-/*
- * Overview:	Read from efuse init map !!!!!
- */
-void EFUSE_ShadowRead(struct adapter *pAdapter, u8 Type, u16 Offset, u32 *Value)
-{
-	if (Type == 1)
-		efuse_ShadowRead1Byte(pAdapter, Offset, (u8 *)Value);
-	else if (Type == 2)
-		efuse_ShadowRead2Byte(pAdapter, Offset, (u16 *)Value);
-	else if (Type == 4)
-		efuse_ShadowRead4Byte(pAdapter, Offset, (u32 *)Value);
-}
drivers/staging/rtl8188eu/include/rtw_efuse.h +0 -2
index adeb501..720f9ea 100644
@@ -116,6 +116,4 @@ u8 Efuse_WordEnableDataWrite(struct adapter *adapter, u16 efuse_addr,
 			     u8 word_en, u8 *data);
 
 void EFUSE_ShadowMapUpdate(struct adapter *adapter, u8 efusetype);
-void EFUSE_ShadowRead(struct adapter *adapt, u8 type, u16 offset, u32 *val);
-
 #endif
Signature · 1 line
1.7.10.4
#9 lore raw

PATCH 9/13 staging: rtl8188eu: use jiffies_to_msecs() instead of rtw_systime_to_ms()

In reply to navin patidar
---
 drivers/staging/rtl8188eu/include/osdep_service.h |    1 -
 drivers/staging/rtl8188eu/os_dep/osdep_service.c  |    7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
index a52dcd5..3ddaa34 100644
@@ -154,7 +154,6 @@ u32  _rtw_down_sema(struct semaphore *sema);
 
 void _rtw_init_queue(struct __queue *pqueue);
 
-u32  rtw_systime_to_ms(u32 systime);
 u32  rtw_ms_to_systime(u32 ms);
 s32  rtw_get_passing_time_ms(u32 start);
 
drivers/staging/rtl8188eu/os_dep/osdep_service.c +1 -6
index 93c76d7..96f8eb8 100644
@@ -77,11 +77,6 @@ void	_rtw_init_queue(struct __queue *pqueue)
 	spin_lock_init(&(pqueue->lock));
 }
 
-inline u32 rtw_systime_to_ms(u32 systime)
-{
-	return systime * 1000 / HZ;
-}
-
 inline u32 rtw_ms_to_systime(u32 ms)
 {
 	return ms * HZ / 1000;
@@ -90,7 +85,7 @@ inline u32 rtw_ms_to_systime(u32 ms)
 /*  the input parameter start must be in jiffies */
 inline s32 rtw_get_passing_time_ms(u32 start)
 {
-	return rtw_systime_to_ms(jiffies-start);
+	return jiffies_to_msecs(jiffies-start);
 }
 
 struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,
Signature · 1 line
1.7.10.4
#10 lore raw

PATCH 10/13 staging: rtl8188eu: Use msecs_to_jiffies() instead of rtw_ms_to_systime()

In reply to navin patidar
---
 drivers/staging/rtl8188eu/core/rtw_pwrctrl.c      |   10 +++++-----
 drivers/staging/rtl8188eu/include/osdep_service.h |    1 -
 drivers/staging/rtl8188eu/os_dep/osdep_service.c  |    5 -----
 3 files changed, 5 insertions(+), 11 deletions(-)
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +5 -5
index 439bc8f..27ed83c 100644
@@ -551,7 +551,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms)
 {
 	struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
-	pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ms);
+	pwrpriv->ips_deny_time = jiffies + msecs_to_jiffies(ms);
 }
 
 /*
@@ -568,9 +568,9 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
 	unsigned long expires;
 	int ret = _SUCCESS;
 
-	expires = jiffies + rtw_ms_to_systime(ips_deffer_ms);
+	expires = jiffies + msecs_to_jiffies(ips_deffer_ms);
 	if (time_before(pwrpriv->ips_deny_time, expires))
-		pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);
+		pwrpriv->ips_deny_time = jiffies + msecs_to_jiffies(ips_deffer_ms);
 
 {
 	u32 start = jiffies;
@@ -624,9 +624,9 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
 	}
 
 exit:
-	expires = jiffies + rtw_ms_to_systime(ips_deffer_ms);
+	expires = jiffies + msecs_to_jiffies(ips_deffer_ms);
 	if (time_before(pwrpriv->ips_deny_time, expires))
-		pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);
+		pwrpriv->ips_deny_time = jiffies + msecs_to_jiffies(ips_deffer_ms);
 	return ret;
 }
 
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
index 3ddaa34..238930c 100644
@@ -154,7 +154,6 @@ u32  _rtw_down_sema(struct semaphore *sema);
 
 void _rtw_init_queue(struct __queue *pqueue);
 
-u32  rtw_ms_to_systime(u32 ms);
 s32  rtw_get_passing_time_ms(u32 start);
 
 struct rtw_netdev_priv_indicator {
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -5
index 96f8eb8..db6ee31 100644
@@ -77,11 +77,6 @@ void	_rtw_init_queue(struct __queue *pqueue)
 	spin_lock_init(&(pqueue->lock));
 }
 
-inline u32 rtw_ms_to_systime(u32 ms)
-{
-	return ms * HZ / 1000;
-}
-
 /*  the input parameter start must be in jiffies */
 inline s32 rtw_get_passing_time_ms(u32 start)
 {
Signature · 1 line
1.7.10.4
#11 lore raw

PATCH 11/13 staging: rtl8188eu: Remove unused function rtw_cbuf_alloc()

In reply to navin patidar
---
 drivers/staging/rtl8188eu/include/osdep_service.h |    1 -
 drivers/staging/rtl8188eu/os_dep/osdep_service.c  |   21 ---------------------
 2 files changed, 22 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
index 238930c..2a20fca 100644
@@ -199,6 +199,5 @@ bool rtw_cbuf_full(struct rtw_cbuf *cbuf);
 bool rtw_cbuf_empty(struct rtw_cbuf *cbuf);
 bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf);
 void *rtw_cbuf_pop(struct rtw_cbuf *cbuf);
-struct rtw_cbuf *rtw_cbuf_alloc(u32 size);
 
 #endif
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -21
index db6ee31..f54cf52 100644
@@ -228,24 +228,3 @@ void *rtw_cbuf_pop(struct rtw_cbuf *cbuf)
 
 	return buf;
 }
-
-/**
- * rtw_cbuf_alloc - allocate a rtw_cbuf with given size and do initialization
- * @size: size of pointer
- *
- * Returns: pointer of srtuct rtw_cbuf, NULL for allocation failure
- */
-struct rtw_cbuf *rtw_cbuf_alloc(u32 size)
-{
-	struct rtw_cbuf *cbuf;
-
-	cbuf = (struct rtw_cbuf *)rtw_malloc(sizeof(*cbuf) +
-	       sizeof(void *)*size);
-
-	if (cbuf) {
-		cbuf->write = 0;
-		cbuf->read = 0;
-		cbuf->size = size;
-	}
-	return cbuf;
-}
Signature · 1 line
1.7.10.4
#12 lore raw

PATCH 12/13 staging: rtl8188eu: Remove unused functions rtw_cbuf_[full, empty, push, pop]()

In reply to navin patidar
---
 drivers/staging/rtl8188eu/include/osdep_service.h |    6 --
 drivers/staging/rtl8188eu/os_dep/osdep_service.c  |   65 ---------------------
 2 files changed, 71 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -6
index 2a20fca..3a620f8 100644
@@ -194,10 +194,4 @@ struct rtw_cbuf {
 	u32 size;
 	void *bufs[0];
 };
-
-bool rtw_cbuf_full(struct rtw_cbuf *cbuf);
-bool rtw_cbuf_empty(struct rtw_cbuf *cbuf);
-bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf);
-void *rtw_cbuf_pop(struct rtw_cbuf *cbuf);
-
 #endif
drivers/staging/rtl8188eu/os_dep/osdep_service.c +0 -65

68 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#13 lore raw

PATCH 13/13 staging: rtl8188eu: osdep_service.h: Remove unused struct rtw_cbuf

In reply to navin patidar
---
 drivers/staging/rtl8188eu/include/osdep_service.h |    7 -------
 1 file changed, 7 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -7
index 3a620f8..fed9c86 100644
@@ -187,11 +187,4 @@ u64 rtw_modular64(u64 x, u64 y);
 
 void rtw_buf_free(u8 **buf, u32 *buf_len);
 void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len);
-
-struct rtw_cbuf {
-	u32 write;
-	u32 read;
-	u32 size;
-	void *bufs[0];
-};
 #endif
Signature · 1 line
1.7.10.4