[PATCH] staging: rtl8188eu: Kill dead calls to kill_pid()

[Larry Finger]

On 05/31/2015 08:04 AM, Jakub Sitnicki wrote:
> There is no interface to register PIDs of processes the driver should
> send a signal to.  Remove it.
>
> Signed-off-by: Jakub Sitnicki <jsitnicki at gmail.com>
> ---
>   drivers/staging/rtl8188eu/include/drv_types.h     |  1 -
>   drivers/staging/rtl8188eu/include/osdep_service.h |  2 --
>   drivers/staging/rtl8188eu/include/rtw_ioctl.h     |  2 --
>   drivers/staging/rtl8188eu/os_dep/mlme_linux.c     |  2 --
>   drivers/staging/rtl8188eu/os_dep/usb_intf.c       | 12 ------------
>   5 files changed, 19 deletions(-)

This patch looks good to me.

ACKed-by: Larry Finger <Larry.Finger at lwfinger.net>


>
> diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
> index c813179..bcc74dc 100644
> --- a/drivers/staging/rtl8188eu/include/drv_types.h
> +++ b/drivers/staging/rtl8188eu/include/drv_types.h
> @@ -175,7 +175,6 @@ static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)
>   };
>
>   struct adapter {
> -	int	pid[3];/* process id from UI, 0:wps, 1:hostapd, 2:dhcpcd */
>   	u16	chip_type;
>
>   	struct dvobj_priv *dvobj;
> diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h b/drivers/staging/rtl8188eu/include/osdep_service.h
> index 515e949..00472e0 100644
> --- a/drivers/staging/rtl8188eu/include/osdep_service.h
> +++ b/drivers/staging/rtl8188eu/include/osdep_service.h
> @@ -157,8 +157,6 @@ void rtw_free_netdev(struct net_device *netdev);
>   #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_modular64(u64 x, u64 y);
>
>   /* Macros for handling unaligned memory accesses */
> diff --git a/drivers/staging/rtl8188eu/include/rtw_ioctl.h b/drivers/staging/rtl8188eu/include/rtw_ioctl.h
> index f3aa924..ee2cb54 100644
> --- a/drivers/staging/rtl8188eu/include/rtw_ioctl.h
> +++ b/drivers/staging/rtl8188eu/include/rtw_ioctl.h
> @@ -117,6 +117,4 @@ int drv_set_info(struct  net_device *MiniportAdapterContext,
>   		 u32 informationbufferlength, u32 *bytesread,
>   		 u32 *bytesneeded);
>
> -extern int ui_pid[3];
> -
>   #endif /*  #ifndef __INC_CEINFO_ */
> diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
> index baff1e2..9099241 100644
> --- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
> +++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
> @@ -41,8 +41,6 @@ void rtw_os_indicate_connect(struct adapter *adapter)
>   {
>   	rtw_indicate_wx_assoc_event(adapter);
>   	netif_carrier_on(adapter->pnetdev);
> -	if (adapter->pid[2] != 0)
> -		rtw_signal_process(adapter->pid[2], SIGALRM);
>   }
>
>   void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted)
> diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
> index ef3c73e..d0d4335 100644
> --- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
> +++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
> @@ -32,8 +32,6 @@
>   #include <usb_hal.h>
>   #include <rtw_ioctl.h>
>
> -int ui_pid[3] = {0, 0, 0};
> -
>   #define USB_VENDER_ID_REALTEK		0x0bda
>
>   /* DID_USB_v916_20130116 */
> @@ -330,11 +328,6 @@ static int rtw_resume_process(struct adapter *padapter)
>
>   	_exit_pwrlock(&pwrpriv->lock);
>
> -	if (padapter->pid[1] != 0) {
> -		DBG_88E("pid[1]:%d\n", padapter->pid[1]);
> -		rtw_signal_process(padapter->pid[1], SIGUSR2);
> -	}
> -
>   	rtw_roaming(padapter, NULL);
>
>   	ret = 0;
> @@ -511,11 +504,6 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
>   		goto free_dvobj;
>   	}
>
> -	if (ui_pid[1] != 0) {
> -		DBG_88E("ui_pid[1]:%d\n", ui_pid[1]);
> -		rtw_signal_process(ui_pid[1], SIGUSR2);
> -	}
> -
>   	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-871x_drv - drv_init, success!\n"));
>
>   	status = _SUCCESS;
>