From 3250ef8601477f9f6536f68251d67665cc104ec6 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 25 Oct 2017 15:06:06 -0500 Subject: [PATCH] rtl8723ds: Fix all instances of using scaler instead of NULL Signed-off-by: Larry Finger --- hal/rtl8723d/rtl8723d_hal_init.c | 2 +- os_dep/linux/ioctl_linux.c | 6 +++--- os_dep/linux/ioctl_mp.c | 2 +- os_dep/linux/os_intfs.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hal/rtl8723d/rtl8723d_hal_init.c b/hal/rtl8723d/rtl8723d_hal_init.c index 28e1f5c..b7454b3 100644 --- a/hal/rtl8723d/rtl8723d_hal_init.c +++ b/hal/rtl8723d/rtl8723d_hal_init.c @@ -6094,7 +6094,7 @@ void rtl8723d_stop_thread(_adapter *padapter) if (xmitpriv->SdioXmitThread) { _rtw_up_sema(&xmitpriv->SdioXmitSema); _rtw_down_sema(&xmitpriv->SdioXmitTerminateSema); - xmitpriv->SdioXmitThread = 0; + xmitpriv->SdioXmitThread = NULL; } #endif #endif diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c index f986a02..b9d5cf9 100644 --- a/os_dep/linux/ioctl_linux.c +++ b/os_dep/linux/ioctl_linux.c @@ -4060,7 +4060,7 @@ static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len) break; case GEN_MP_IOCTL_SUBCODE(TRIGGER_GPIO): RTW_INFO("==> trigger gpio 0\n"); - rtw_hal_set_hwreg(padapter, HW_VAR_TRIGGER_GPIO_0, 0); + rtw_hal_set_hwreg(padapter, HW_VAR_TRIGGER_GPIO_0, NULL); break; #ifdef CONFIG_BT_COEXIST case GEN_MP_IOCTL_SUBCODE(SET_DM_BT): @@ -8962,7 +8962,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, struct pwrctrl_priv *pwrctrlpriv ; u8 *data = NULL; u8 *rawdata = NULL; - char *pch, *ptmp, *token, *tmp[3] = {0x00, 0x00, 0x00}; + char *pch, *ptmp, *token, *tmp[3] = {NULL, NULL, NULL}; u16 i = 0, j = 0, mapLen = 0, addr = 0, cnts = 0; u16 max_available_len = 0, raw_cursize = 0, raw_maxsize = 0; u16 mask_len; @@ -9575,7 +9575,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, u8 *ShadowMapBT = NULL; u8 *ShadowMapWiFi = NULL; u8 *setrawdata = NULL; - char *pch, *ptmp, *token, *tmp[3] = {0x00, 0x00, 0x00}; + char *pch, *ptmp, *token, *tmp[3] = {NULL, NULL, NULL}; u16 addr = 0xFF, cnts = 0, BTStatus = 0 , max_available_len = 0; u16 wifimaplen; int err; diff --git a/os_dep/linux/ioctl_mp.c b/os_dep/linux/ioctl_mp.c index bcdbd1e..9ced137 100644 --- a/os_dep/linux/ioctl_mp.c +++ b/os_dep/linux/ioctl_mp.c @@ -884,7 +884,7 @@ int rtw_mp_arx(struct net_device *dev, int bStartRx = 0, bStopRx = 0, bQueryPhy = 0, bQueryMac = 0, bSetBssid = 0; int bmac_filter = 0, bfilter_init = 0, bmon = 0, bSmpCfg = 0, bloopbk = 0; u8 input[wrqu->length]; - char *pch, *ptmp, *token, *tmp[2] = {0x00, 0x00}; + char *pch, *ptmp, *token, *tmp[2] = {NULL, NULL}; u32 i = 0, ii = 0, jj = 0, kk = 0, cnts = 0, ret; PADAPTER padapter = rtw_netdev_priv(dev); struct mp_priv *pmppriv = &padapter->mppriv; diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 90b73c8..341986e 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -299,7 +299,7 @@ MODULE_PARM_DESC(ifname, "The default name to allocate for first interface"); module_param(if2name, charp, 0644); MODULE_PARM_DESC(if2name, "The default name to allocate for second interface"); -char *rtw_initmac = 0; /* temp mac address if users want to use instead of the mac address in Efuse */ +char *rtw_initmac = NULL; /* temp mac address if users want to use instead of the mac address in Efuse */ #ifdef CONFIG_CONCURRENT_MODE