staging: r8712u: Remove defines that are not used

This driver has a number of defines, etc. that are not used.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h
index 62b55663c63a753bb0fa63aa496a17100ca92670..a074fe81016951bae0050606def649619453c395 100644 (file)
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -70,9 +70,7 @@ struct        qos_priv        {
 #include "rtl871x_event.h"
 #include "rtl871x_led.h"
 
-#define SPEC_DEV_ID_NONE BIT(0)
 #define SPEC_DEV_ID_DISABLE_HT BIT(1)
-#define SPEC_DEV_ID_ENABLE_PS BIT(2)
 
 struct specific_device_id {
        u32             flags;
@@ -127,13 +125,6 @@ struct registry_priv {
        u8 wifi_test;
 };
 
-/* For registry parameters */
-#define RGTRY_OFT(field) ((addr_t)FIELD_OFFSET(struct registry_priv, field))
-#define RGTRY_SZ(field)   sizeof(((struct registry_priv *)0)->field)
-#define BSSID_OFT(field) ((addr_t)FIELD_OFFSET(struct ndis_wlan_bssid_ex, \
-                        field))
-#define BSSID_SZ(field)   sizeof(((struct ndis_wlan_bssid_ex *)0)->field)
-
 struct dvobj_priv {
        struct _adapter *padapter;
        u32 nr_endpoint;

diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.h b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
index 6024c4f63d5bd64179afab9a81da69801c3fa51b..70ff924fba04c213f8d3971e5642495433b9bf05 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.h
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.h
@@ -30,26 +30,7 @@
 #include "drv_types.h"
 
 
-#define FW_PWR0        0
-#define FW_PWR1                1
-#define FW_PWR2                2
-#define FW_PWR3                3
-
-
-#define HW_PWR0        7
-#define HW_PWR1                6
-#define HW_PWR2                2
-#define HW_PWR3        0
-#define HW_PWR4        8
-
-#define FW_PWRMSK      0x7
-
-
-#define XMIT_ALIVE     BIT(0)
-#define RECV_ALIVE     BIT(1)
 #define CMD_ALIVE      BIT(2)
-#define EVT_ALIVE      BIT(3)
-
 
 enum Power_Mgnt {
        PS_MODE_ACTIVE  = 0     ,
@@ -66,7 +47,6 @@ enum Power_Mgnt {
        PS_MODE_NUM
 };
 
-
 /*
        BIT[2:0] = HW state
        BIT[3] = Protocol PS state, 0: register active state,

diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index c758c40e0c85a110815e693d65118e3bc24c4af4..6b73843e580af46e373c7885898b45e97baa9928 100644 (file)
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -37,7 +37,6 @@
 #include "recv_osdep.h"
 #include "xmit_osdep.h"
 #include "rtl8712_efuse.h"
-#include "usb_vendor_req.h"
 #include "usb_ops.h"
 #include "usb_osintf.h"
 

diff --git a/drivers/staging/rtl8712/usb_osintf.h b/drivers/staging/rtl8712/usb_osintf.h
index d95797aac37a867be74cba3a94a8aaf3c1ae13d8..609f9210cc4655291ec327fbf12fe6211b678660 100644 (file)
--- a/drivers/staging/rtl8712/usb_osintf.h
+++ b/drivers/staging/rtl8712/usb_osintf.h
@@ -28,9 +28,6 @@
 
 #include "osdep_service.h"
 #include "drv_types.h"
-#include "usb_vendor_req.h"
-
-#define USBD_HALTED(Status) ((u32)(Status) >> 30 == 3)
 
 extern char *r8712_initmac;
 

diff --git a/drivers/staging/rtl8712/usb_vendor_req.h b/drivers/staging/rtl8712/usb_vendor_req.h
deleted file mode 100644 (file)
index 82335a8..0000000
--- a/drivers/staging/rtl8712/usb_vendor_req.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2010 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * Modifications for inclusion into the Linux staging tree are
- * Copyright(c) 2010 Larry Finger. All rights reserved.
- *
- * Contact information:
- * WLAN FAE <wlanfae@realtek.com>
- * Larry Finger <Larry.Finger@lwfinger.net>
- *
- ******************************************************************************/
-#ifndef _USB_VENDOR_REQUEST_H_
-#define _USB_VENDOR_REQUEST_H_
-
-/*4    Set/Get Register related wIndex/Data */
-#define        RT_USB_RESET_MASK_OFF           0
-#define        RT_USB_RESET_MASK_ON            1
-#define        RT_USB_SLEEP_MASK_OFF           0
-#define        RT_USB_SLEEP_MASK_ON            1
-#define        RT_USB_LDO_ON                   1
-#define        RT_USB_LDO_OFF                  0
-
-/*4    Set/Get SYSCLK related  wValue or Data */
-#define        RT_USB_SYSCLK_32KHZ             0
-#define        RT_USB_SYSCLK_40MHZ             1
-#define        RT_USB_SYSCLK_60MHZ             2
-
-enum RT_USB_BREQUEST {
-       RT_USB_SET_REGISTER             = 1,
-       RT_USB_SET_SYSCLK               = 2,
-       RT_USB_GET_SYSCLK               = 3,
-       RT_USB_GET_REGISTER             = 4
-};
-
-enum RT_USB_WVALUE {
-       RT_USB_RESET_MASK       =       1,
-       RT_USB_SLEEP_MASK       =       2,
-       RT_USB_USB_HRCPWM       =       3,
-       RT_USB_LDO              =       4,
-       RT_USB_BOOT_TYPE        =       5
-};
-
-#endif
-