aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2014-04-09 23:21:01 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-14 08:29:15 -0700
commitce16d2f18944f9ba6cafbc73be20803d848adf78 (patch)
tree4ea38767c2cb9db99ef2f20acf6e3f1db6c432e3
parentstaging: rtl8723au: Remove two layers of wrappers around rtw_cfg80211_indicate_scan_done() (diff)
staging: rtl8723au: Don't wrap kill_pid() in an unnecessary macro
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8723au/hal/rtl8723a_dm.c2
-rw-r--r--drivers/staging/rtl8723au/include/osdep_service.h2
-rw-r--r--drivers/staging/rtl8723au/os_dep/mlme_linux.c2
-rw-r--r--drivers/staging/rtl8723au/os_dep/usb_intf.c2
4 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index b3907ca2e96b..71ee47abcace 100644
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -76,7 +76,7 @@ static void dm_CheckPbcGPIO(struct rtw_adapter *padapter)
return;
}
- rtw_signal_process(padapter->pid[0], SIGUSR1);
+ kill_pid(find_vpid(padapter->pid[0]), SIGUSR1, 1);
}
}
diff --git a/drivers/staging/rtl8723au/include/osdep_service.h b/drivers/staging/rtl8723au/include/osdep_service.h
index 039bc7285ed0..e03d19b84bcb 100644
--- a/drivers/staging/rtl8723au/include/osdep_service.h
+++ b/drivers/staging/rtl8723au/include/osdep_service.h
@@ -174,8 +174,6 @@ void rtw_unlock_suspend(void);
#define FUNC_ADPT_FMT "%s(%s)"
#define FUNC_ADPT_ARG(adapter) __func__, adapter->pnetdev->name
-#define rtw_signal_process(pid, sig) kill_pid(find_vpid((pid)),(sig), 1)
-
u64 rtw_modular6423a(u64 x, u64 y);
u64 rtw_division6423a(u64 x, u64 y);
diff --git a/drivers/staging/rtl8723au/os_dep/mlme_linux.c b/drivers/staging/rtl8723au/os_dep/mlme_linux.c
index 37ecdb4eba2d..d07e2203950c 100644
--- a/drivers/staging/rtl8723au/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8723au/os_dep/mlme_linux.c
@@ -27,7 +27,7 @@ void rtw_os_indicate_connect23a(struct rtw_adapter *adapter)
netif_carrier_on(adapter->pnetdev);
if (adapter->pid[2] != 0)
- rtw_signal_process(adapter->pid[2], SIGALRM);
+ kill_pid(find_vpid(adapter->pid[2]), SIGALRM, 1);
}
static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE];
diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index 778508d3a047..e6fbe6a62a6b 100644
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -566,7 +566,7 @@ int rtw_resume_process23a(struct rtw_adapter *padapter)
if (padapter->pid[1] != 0) {
DBG_8723A("pid[1]:%d\n", padapter->pid[1]);
- rtw_signal_process(padapter->pid[1], SIGUSR2);
+ kill_pid(find_vpid(padapter->pid[1]), SIGUSR2, 1);
}
rtw23a_roaming(padapter, NULL);