Merge tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver updates from Greg KH:
 "Here's the big pull request for the staging driver tree for 3.17-rc1.

  Lots of things in here, over 2000 patches, but the best part is this:
   1480 files changed, 39070 insertions(+), 254659 deletions(-)

  Thanks to the great work of Kristina Martšenko, 14 different staging
  drivers have been removed from the tree as they were obsolete and no
  one was willing to work on cleaning them up.  Other than the driver
  removals, loads of cleanups are in here (comedi, lustre, etc.) as well
  as the usual IIO driver updates and additions.

  All of this has been in the linux-next tree for a while"

* tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (2199 commits)
  staging: comedi: addi_apci_1564: remove diagnostic interrupt support code
  staging: comedi: addi_apci_1564: add subdevice to check diagnostic status
  staging: wlan-ng: coding style problem fix
  staging: wlan-ng: fixing coding style problems
  staging: comedi: ii_pci20kc: request and ioremap memory
  staging: lustre: bitwise vs logical typo
  staging: dgnc: Remove unneeded dgnc_trace.c and dgnc_trace.h
  staging: dgnc: rephrase comment
  staging: comedi: ni_tio: remove some dead code
  staging: rtl8723au: Fix static symbol sparse warning
  staging: rtl8723au: usb_dvobj_init(): Remove unused variable 'pdev_desc'
  staging: rtl8723au: Do not duplicate kernel provided USB macros
  staging: rtl8723au: Remove never set struct pwrctrl_priv.bHWPowerdown
  staging: rtl8723au: Remove two never set variables
  staging: rtl8723au: RSSI_test is never set
  staging:r8190: coding style: Fixed checkpatch reported Error
  staging:r8180: coding style: Fixed too long lines
  staging:r8180: coding style: Fixed commenting style
  staging: lustre: ptlrpc: lproc_ptlrpc.c - fix dereferenceing user space buffer
  staging: lustre: ldlm: ldlm_resource.c - fix dereferenceing user space buffer
  ...

1 files changed, 0 insertions, 198 deletions

diff --git a/drivers/staging/silicom/bypasslib/bp_ioctl.h b/drivers/staging/silicom/bypasslib/bp_ioctl.h
deleted file mode 100644
index a13932af733..00000000000
--- a/drivers/staging/silicom/bypasslib/bp_ioctl.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/* bypass library, Copyright (c) 2004-2006 Silicom, Ltd                       */
-/* Corporation.                                                               */
-/*                                                                            */
-/* This program is free software; you can redistribute it and/or modify       */
-/* it under the terms of the GNU General Public License as published by       */
-/* the Free Software Foundation, located in the file LICENSE.                 */
-/*                                                                            */
-/*                                                                            */
-/*                                                                            */
-/******************************************************************************/
-
-#ifndef BP_IOCTL_H
-#define BP_IOCTL_H
-
-#define BP_CAP                   0x01	/* BIT_0 */
-#define BP_STATUS_CAP            0x02	/* BIT_1 */
-#define BP_STATUS_CHANGE_CAP     0x04	/* BIT_2 */
-#define SW_CTL_CAP               0x08	/* BIT_3 */
-#define BP_DIS_CAP               0x10	/* BIT_4 */
-#define BP_DIS_STATUS_CAP        0x20	/* BIT_5 */
-#define STD_NIC_CAP              0x40	/* BIT_6 */
-#define BP_PWOFF_ON_CAP          0x80	/* BIT_7 */
-#define BP_PWOFF_OFF_CAP         0x0100	/* BIT_8 */
-#define BP_PWOFF_CTL_CAP         0x0200	/* BIT_9 */
-#define BP_PWUP_ON_CAP           0x0400	/* BIT_10 */
-#define BP_PWUP_OFF_CAP          0x0800	/* BIT_11 */
-#define BP_PWUP_CTL_CAP          0x1000	/* BIT_12 */
-#define WD_CTL_CAP               0x2000	/* BIT_13 */
-#define WD_STATUS_CAP            0x4000	/* BIT_14 */
-#define WD_TIMEOUT_CAP           0x8000	/* BIT_15 */
-#define TX_CTL_CAP               0x10000	/* BIT_16 */
-#define TX_STATUS_CAP            0x20000	/* BIT_17 */
-#define TAP_CAP                  0x40000	/* BIT_18 */
-#define TAP_STATUS_CAP           0x80000	/* BIT_19 */
-#define TAP_STATUS_CHANGE_CAP    0x100000	/* BIT_20 */
-#define TAP_DIS_CAP              0x200000	/* BIT_21 */
-#define TAP_DIS_STATUS_CAP       0x400000	/* BIT_22 */
-#define TAP_PWUP_ON_CAP          0x800000	/* BIT_23 */
-#define TAP_PWUP_OFF_CAP         0x1000000	/* BIT 24 */
-#define TAP_PWUP_CTL_CAP         0x2000000	/* BIT 25 */
-#define NIC_CAP_NEG              0x4000000	/* BIT 26 */
-#define TPL_CAP                  0x8000000	/* BIT 27 */
-#define DISC_CAP                 0x10000000	/* BIT 28 */
-#define DISC_DIS_CAP             0x20000000	/* BIT 29 */
-#define DISC_PWUP_CTL_CAP        0x40000000	/* BIT 30 */
-
-#define WD_MIN_TIME_MASK(val)      (val & 0xf)
-#define WD_STEP_COUNT_MASK(val)    ((val & 0xf) << 5)
-#define WDT_STEP_TIME              0x10	/* BIT_4 */
-
-#define WD_MIN_TIME_GET(desc)   (desc & 0xf)
-#define WD_STEP_COUNT_GET(desc) ((desc>>5) & 0xf)
-
-enum {
-	IS_BYPASS = 1,
-	GET_BYPASS_SLAVE,
-	GET_BYPASS_CAPS,
-	GET_WD_SET_CAPS,
-	SET_BYPASS,
-	GET_BYPASS,
-	GET_BYPASS_CHANGE,
-	SET_BYPASS_WD,
-	GET_BYPASS_WD,
-	GET_WD_EXPIRE_TIME,
-	RESET_BYPASS_WD_TIMER,
-	SET_DIS_BYPASS,
-	GET_DIS_BYPASS,
-	SET_BYPASS_PWOFF,
-	GET_BYPASS_PWOFF,
-	SET_BYPASS_PWUP,
-	GET_BYPASS_PWUP,
-	SET_STD_NIC,
-	GET_STD_NIC,
-	SET_TX,
-	GET_TX,
-	SET_TAP,
-	GET_TAP,
-	GET_TAP_CHANGE,
-	SET_DIS_TAP,
-	GET_DIS_TAP,
-	SET_TAP_PWUP,
-	GET_TAP_PWUP,
-	SET_WD_EXP_MODE,
-	GET_WD_EXP_MODE,
-	SET_WD_AUTORESET,
-	GET_WD_AUTORESET,
-	SET_TPL,
-	GET_TPL,
-	SET_DISC,
-	GET_DISC,
-	GET_DISC_CHANGE,
-	SET_DIS_DISC,
-	GET_DIS_DISC,
-	SET_DISC_PWUP,
-	GET_DISC_PWUP,
-
-	GET_BYPASS_INFO = 100,
-	GET_BP_WAIT_AT_PWUP,
-	SET_BP_WAIT_AT_PWUP,
-	GET_BP_HW_RESET,
-	SET_BP_HW_RESET,
-};
-
-enum {
-	IF_SCAN_SD,
-	GET_DEV_NUM_SD,
-	IS_BYPASS_SD,
-	GET_BYPASS_SLAVE_SD,
-	GET_BYPASS_CAPS_SD,
-	GET_WD_SET_CAPS_SD,
-	SET_BYPASS_SD,
-	GET_BYPASS_SD,
-	GET_BYPASS_CHANGE_SD,
-	SET_BYPASS_WD_SD,
-	GET_BYPASS_WD_SD,
-	GET_WD_EXPIRE_TIME_SD,
-	RESET_BYPASS_WD_TIMER_SD,
-	SET_DIS_BYPASS_SD,
-	GET_DIS_BYPASS_SD,
-	SET_BYPASS_PWOFF_SD,
-	GET_BYPASS_PWOFF_SD,
-	SET_BYPASS_PWUP_SD,
-	GET_BYPASS_PWUP_SD,
-	SET_STD_NIC_SD,
-	GET_STD_NIC_SD,
-	SET_TX_SD,
-	GET_TX_SD,
-	SET_TAP_SD,
-	GET_TAP_SD,
-	GET_TAP_CHANGE_SD,
-	SET_DIS_TAP_SD,
-	GET_DIS_TAP_SD,
-	SET_TAP_PWUP_SD,
-	GET_TAP_PWUP_SD,
-	SET_WD_EXP_MODE_SD,
-	GET_WD_EXP_MODE_SD,
-	SET_WD_AUTORESET_SD,
-	GET_WD_AUTORESET_SD,
-	SET_TPL_SD,
-	GET_TPL_SD,
-	SET_DISC_SD,
-	GET_DISC_SD,
-	GET_DISC_CHANGE_SD,
-	SET_DIS_DISC_SD,
-	GET_DIS_DISC_SD,
-	SET_DISC_PWUP_SD,
-	GET_DISC_PWUP_SD,
-
-	GET_BYPASS_INFO_SD = 100,
-	GET_BP_WAIT_AT_PWUP_SD,
-	SET_BP_WAIT_AT_PWUP_SD,
-	GET_BP_HW_RESET_SD,
-	SET_BP_HW_RESET_SD,
-
-};
-
-#define SIOCGIFBYPASS (SIOCDEVPRIVATE+10)
-
-struct bp_info {
-	char prod_name[14];
-	unsigned char fw_ver;
-};
-
-/* for passing single values */
-struct if_bypass {
-	char if_name[IFNAMSIZ];
-	int cmd;
-	int data;
-};
-struct if_bypass_info {
-	char if_name[IFNAMSIZ];
-	char cmd;
-	struct bp_info bp_info;
-};
-
-/*
-* The major device number. We can't rely on dynamic
-* registration any more, because ioctls need to know
-* it.
-*/
-
-#define MAGIC_NUM 'J'
-
-/* for passing single values */
-struct bpctl_cmd {
-	int status;
-	int data[8];
-	int in_param[8];
-	int out_param[8];
-};
-
-#define IOCTL_TX_MSG(cmd) _IOWR(MAGIC_NUM, cmd, struct bpctl_cmd)
-
-#define DEVICE_NAME "bpctl"
-
-#endif