On Tue, Jul 08, 2014 at 12:10:02AM +0530, navin patidar wrote:
> rtw_alloc_etherdev() is used in rtw_init_netdev() but never gets called
> because old_padapter is never NULL.
>
> Signed-off-by: navin patidar <navin.patidar@xxxxxxxxx>
> ---
> 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(-)
>
> diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h b/drivers/staging/rtl8188eu/include/osdep_service.h
> index 95131fe..a52dcd5 100644
> --- a/drivers/staging/rtl8188eu/include/osdep_service.h
> +++ b/drivers/staging/rtl8188eu/include/osdep_service.h
> @@ -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)
> diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
> index b0c38a4..c7a44ab 100644
> --- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
> @@ -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.
> - else
> - pnetdev = rtw_alloc_etherdev(sizeof(struct adapter));
>
regards,
dan carpenter
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
