From abf6b68d1c5173c85eb3dd68db94f65051196d20 Mon Sep 17 00:00:00 2001
From: Ali Bahar <ali@internetdog.org>
Date: Sun, 4 Sep 2011 03:14:06 +0800
Subject: [PATCH] --- yaml --- r: 268282 b: refs/heads/master c:
 7bcd9ce6de23fc11c7cfe42b4d541922b77d6867 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/rtl8712/os_intfs.c      | 2 +-
 trunk/drivers/staging/rtl8712/osdep_service.h | 5 -----
 trunk/drivers/staging/rtl8712/usb_intf.c      | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3eab6a095d78..cbd627437f80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c1f4203a2883c50e2d754b176fcfcd5be34549b
+refs/heads/master: 7bcd9ce6de23fc11c7cfe42b4d541922b77d6867
diff --git a/trunk/drivers/staging/rtl8712/os_intfs.c b/trunk/drivers/staging/rtl8712/os_intfs.c
index 90949cfacd6d..a46d4bb567a7 100644
--- a/trunk/drivers/staging/rtl8712/os_intfs.c
+++ b/trunk/drivers/staging/rtl8712/os_intfs.c
@@ -348,7 +348,7 @@ u8 r8712_free_drv_sw(struct _adapter *padapter)
 	_r8712_free_recv_priv(&padapter->recvpriv);
 	mp871xdeinit(padapter);
 	if (pnetdev)
-		os_free_netdev(pnetdev);
+		free_netdev(pnetdev);
 	return _SUCCESS;
 }
 
diff --git a/trunk/drivers/staging/rtl8712/osdep_service.h b/trunk/drivers/staging/rtl8712/osdep_service.h
index 60e586c7d608..799ebaca2da7 100644
--- a/trunk/drivers/staging/rtl8712/osdep_service.h
+++ b/trunk/drivers/staging/rtl8712/osdep_service.h
@@ -78,11 +78,6 @@ struct	__queue	{
 		spin_lock_init(&((pqueue)->lock));	\
 	} while (0)
 
-static inline void os_free_netdev(struct net_device *dev)
-{
-	free_netdev(dev);
-}
-
 static inline struct list_head *get_next(struct list_head *list)
 {
 	return list->next;
diff --git a/trunk/drivers/staging/rtl8712/usb_intf.c b/trunk/drivers/staging/rtl8712/usb_intf.c
index e590ebd3a452..263a4b510ed3 100644
--- a/trunk/drivers/staging/rtl8712/usb_intf.c
+++ b/trunk/drivers/staging/rtl8712/usb_intf.c
@@ -599,7 +599,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
 	if (padapter->dvobj_deinit != NULL)
 		padapter->dvobj_deinit(padapter);
 	if (pnetdev)
-		os_free_netdev(pnetdev);
+		free_netdev(pnetdev);
 	return -ENODEV;
 }