From 62c8526d60181da14fa73a43ed23f3314523b4f5 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Mon, 26 May 2014 13:59:07 +0100 Subject: [PATCH] staging: vt6656: dead code remove control.c/h Replace control.h headers with usbpipe.h Also add to usbpipe.c its header Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/Makefile | 1 - drivers/staging/vt6656/baseband.c | 2 +- drivers/staging/vt6656/bssdb.c | 2 +- drivers/staging/vt6656/card.c | 2 +- drivers/staging/vt6656/control.c | 52 --------------------------------------- drivers/staging/vt6656/control.h | 39 ----------------------------- drivers/staging/vt6656/firmware.c | 2 +- drivers/staging/vt6656/iwctl.c | 2 +- drivers/staging/vt6656/key.c | 2 +- drivers/staging/vt6656/mac.c | 2 +- drivers/staging/vt6656/main_usb.c | 2 +- drivers/staging/vt6656/power.c | 2 +- drivers/staging/vt6656/rf.c | 2 +- drivers/staging/vt6656/usbpipe.c | 1 + drivers/staging/vt6656/wcmd.c | 2 +- drivers/staging/vt6656/wmgr.c | 2 +- drivers/staging/vt6656/wpactl.c | 2 +- 17 files changed, 14 insertions(+), 105 deletions(-) delete mode 100644 drivers/staging/vt6656/control.c delete mode 100644 drivers/staging/vt6656/control.h diff --git a/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile index e39d2492f24f..b5ec483f3eb4 100644 --- a/drivers/staging/vt6656/Makefile +++ b/drivers/staging/vt6656/Makefile @@ -27,7 +27,6 @@ vt6656_stage-y += main_usb.o \ wpactl.o \ usbpipe.o \ channel.o \ - control.o \ firmware.o \ int.o diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index 4cdea2cfdd29..d96308f00d22 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -40,7 +40,7 @@ #include "mac.h" #include "baseband.h" #include "rf.h" -#include "control.h" +#include "usbpipe.h" #include "datarate.h" static u8 abyVT3184_AGC[] = { diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index 12b6436eb2a3..f53d3bf629be 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -53,7 +53,7 @@ #include "card.h" #include "mac.h" #include "wpa2.h" -#include "control.h" +#include "usbpipe.h" #include "iowpa.h" #include "power.h" diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 9313730117fc..06f8b00c6746 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -57,7 +57,7 @@ #include "rc4.h" #include "country.h" #include "datarate.h" -#include "control.h" +#include "usbpipe.h" //const u16 cwRXBCNTSFOff[MAX_RATE] = //{17, 34, 96, 192, 34, 23, 17, 11, 8, 5, 4, 3}; diff --git a/drivers/staging/vt6656/control.c b/drivers/staging/vt6656/control.c deleted file mode 100644 index b6e31f3cf962..000000000000 --- a/drivers/staging/vt6656/control.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc. - * All rights reserved. - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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-1301 USA. - * - * - * File: control.c - * - * Purpose: Handle USB control endpoint - * - * Author: Jerry Chen - * - * Date: Apr. 5, 2004 - * - * Functions: - * vnt_control_out - Write variable length bytes to MEM/BB/MAC/EEPROM - * ControlvReadByte - Read one byte from MEM/BB/MAC/EEPROM - * ControlvMaskByte - Read one byte from MEM/BB/MAC/EEPROM and clear/set - * some bits in the same address - * - * Revision History: - * 04-05-2004 Jerry Chen: Initial release - * 11-24-2004 Warren Hsu: Add ControlvWriteByte, ControlvReadByte, - * ControlvMaskByte - * - */ - -#include "control.h" - -/* static int msglevel =MSG_LEVEL_INFO; */ -/* static int msglevel =MSG_LEVEL_DEBUG; */ - -void ControlvReadByte(struct vnt_private *pDevice, u8 reg, u8 reg_off, - u8 *data) -{ - vnt_control_in(pDevice, MESSAGE_TYPE_READ, - reg_off, reg, sizeof(u8), data); - return; -} diff --git a/drivers/staging/vt6656/control.h b/drivers/staging/vt6656/control.h deleted file mode 100644 index 48f4836a5146..000000000000 --- a/drivers/staging/vt6656/control.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc. - * All rights reserved. - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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-1301 USA. - * - * - * File: control.h - * - * Purpose: - * - * Author: Jerry Chen - * - * Date: Apr. 5, 2004 - * - */ - -#ifndef __CONTROL_H__ -#define __CONTROL_H__ - -#include "device.h" -#include "usbpipe.h" - -void ControlvReadByte(struct vnt_private *pDevice, u8 reg, u8 reg_off, - u8 *data); - -#endif /* __CONTROL_H__ */ diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index f9d685f00300..1159f0b34578 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -33,7 +33,7 @@ #include #include "firmware.h" -#include "control.h" +#include "usbpipe.h" static int msglevel = MSG_LEVEL_INFO; /* static int msglevel = MSG_LEVEL_DEBUG; */ diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c index 0a8e4384d83b..94b7fe8940ce 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c @@ -38,7 +38,7 @@ #include "rf.h" #include "iowpa.h" #include "wpactl.h" -#include "control.h" +#include "usbpipe.h" #include "baseband.h" static const long frequency_list[] = { diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index 11aa82a08f0e..38ea67531d97 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c @@ -39,7 +39,7 @@ #include "mac.h" #include "tmacro.h" #include "key.h" -#include "control.h" +#include "usbpipe.h" static int msglevel =MSG_LEVEL_INFO; //static int msglevel =MSG_LEVEL_DEBUG; diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index fdb244f9e3a9..cadf7cd280c3 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -35,7 +35,7 @@ #include "desc.h" #include "mac.h" #include "80211hdr.h" -#include "control.h" +#include "usbpipe.h" /* * Description: diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index df206e607680..e18071f121c5 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -65,7 +65,7 @@ #include "datarate.h" #include "rf.h" #include "firmware.h" -#include "control.h" +#include "usbpipe.h" #include "channel.h" #include "int.h" #include "iowpa.h" diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c index b8ebf589fd9f..ddbd04695c99 100644 --- a/drivers/staging/vt6656/power.c +++ b/drivers/staging/vt6656/power.c @@ -44,7 +44,7 @@ #include "wcmd.h" #include "rxtx.h" #include "card.h" -#include "control.h" +#include "usbpipe.h" static int msglevel = MSG_LEVEL_INFO; diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c index 58ea16c8767d..d244dab498e0 100644 --- a/drivers/staging/vt6656/rf.c +++ b/drivers/staging/vt6656/rf.c @@ -38,7 +38,7 @@ #include "mac.h" #include "rf.h" #include "baseband.h" -#include "control.h" +#include "usbpipe.h" #include "datarate.h" static int msglevel =MSG_LEVEL_INFO; diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index fc68badd8636..e4751b71e4d3 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -43,6 +43,7 @@ #include "dpc.h" #include "desc.h" #include "device.h" +#include "usbpipe.h" //endpoint def //endpoint 0: control diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 91754fd2cedb..9a166fbcfa1f 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -48,7 +48,7 @@ #include "power.h" #include "wctl.h" #include "baseband.h" -#include "control.h" +#include "usbpipe.h" #include "rxtx.h" #include "rf.h" #include "channel.h" diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 8cb80a677335..18723eab93d2 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -78,7 +78,7 @@ #include "wpa.h" #include "rf.h" #include "iowpa.h" -#include "control.h" +#include "usbpipe.h" static int msglevel = MSG_LEVEL_INFO; //static int msglevel =MSG_LEVEL_DEBUG; diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c index 587e1117b8c7..0a067151eca5 100644 --- a/drivers/staging/vt6656/wpactl.c +++ b/drivers/staging/vt6656/wpactl.c @@ -38,7 +38,7 @@ #include "wmgr.h" #include "iocmd.h" #include "iowpa.h" -#include "control.h" +#include "usbpipe.h" #include "rf.h" static int msglevel = MSG_LEVEL_INFO; -- 2.11.0