[PATCH 3/3] staging: vt6655: delete SndEvt_ToAPI code

Greg Kroah-Hartman gregkh at linuxfoundation.org
Thu Oct 9 23:59:41 UTC 2014


On Thu, Oct 09, 2014 at 03:38:55PM +1100, Vladimir A. Nazarenko wrote:
> It's never enabled, so we can safely remove it.
> 
> Signed-off-by: Vladimir A. Nazarenko <naszar at ya.ru>
> ---
>  drivers/staging/vt6655/device_main.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
> index de5378e..6728de5 100644
> --- a/drivers/staging/vt6655/device_main.c
> +++ b/drivers/staging/vt6655/device_main.c
> @@ -2916,14 +2916,8 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
>  
>  	case IOCTL_CMD_SET:
>  
> -#ifdef SndEvt_ToAPI
> -		if ((((PSCmdRequest)rq)->wCmdCode != WLAN_CMD_SET_EVT) &&
> -		    !(pDevice->flags & DEVICE_FLAGS_OPENED))
> -#else
> -			if (!(pDevice->flags & DEVICE_FLAGS_OPENED) &&
> -			    (((PSCmdRequest)rq)->wCmdCode != WLAN_CMD_SET_WPA))
> -#endif
> -			{
> +		if (!(pDevice->flags & DEVICE_FLAGS_OPENED) &&
> +		    (((PSCmdRequest)rq)->wCmdCode != WLAN_CMD_SET_WPA))	{
>  				rc = -EFAULT;
>  				break;
>  			} else {

This didn't apply to my tree :(


More information about the devel mailing list