Merge tag 'upstream-4.1-rc1' of git://git.infradead.org/linux-ubifs

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8712 / os_intfs.c

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index 78815b6170c784fe26dcc947cc3871b1c17b9520..6e776e5433f67bfb96e6a5dda56c46713842436e 100644 (file)
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -177,7 +177,7 @@ static uint loadparam(struct _adapter *padapter, struct  net_device *pnetdev)
 
 static int r871x_net_set_mac_address(struct net_device *pnetdev, void *p)
 {
-       struct _adapter *padapter = (struct _adapter *)netdev_priv(pnetdev);
+       struct _adapter *padapter = netdev_priv(pnetdev);
        struct sockaddr *addr = p;
 
        if (padapter->bup == false)
@@ -187,7 +187,7 @@ static int r871x_net_set_mac_address(struct net_device *pnetdev, void *p)
 
 static struct net_device_stats *r871x_net_get_stats(struct net_device *pnetdev)
 {
-       struct _adapter *padapter = (struct _adapter *) netdev_priv(pnetdev);
+       struct _adapter *padapter = netdev_priv(pnetdev);
        struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
        struct recv_priv *precvpriv = &(padapter->recvpriv);
 
@@ -221,7 +221,7 @@ struct net_device *r8712_init_netdev(void)
                strcpy(ifname, "wlan%d");
                dev_alloc_name(pnetdev, ifname);
        }
-       padapter = (struct _adapter *) netdev_priv(pnetdev);
+       padapter = netdev_priv(pnetdev);
        padapter->pnetdev = pnetdev;
        pr_info("r8712u: register rtl8712_netdev_ops to netdev_ops\n");
        pnetdev->netdev_ops = &rtl8712_netdev_ops;
@@ -384,7 +384,7 @@ static void enable_video_mode(struct _adapter *padapter, int cbw40_value)
  */
 static int netdev_open(struct net_device *pnetdev)
 {
-       struct _adapter *padapter = (struct _adapter *)netdev_priv(pnetdev);
+       struct _adapter *padapter = netdev_priv(pnetdev);
 
        mutex_lock(&padapter->mutex_start);
        if (padapter->bup == false) {
@@ -452,7 +452,7 @@ netdev_open_error:
  */
 static int netdev_close(struct net_device *pnetdev)
 {
-       struct _adapter *padapter = (struct _adapter *) netdev_priv(pnetdev);
+       struct _adapter *padapter = netdev_priv(pnetdev);
 
        /* Close LED*/
        padapter->ledpriv.LedControlHandler(padapter, LED_CTL_POWER_OFF);