aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-12-17 17:20:23 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:52:36 -0800
commit37bcd24b845abbfd85c838ee9ce07c2b254d3a05 (patch)
tree457da44faafc258df108aec26f6385887bd6f4fd /drivers/staging
parent006ef0ec96de0dec01064df86febbc813f23c96a (diff)
Staging: frontier: fix compiler warnings
Basically remove unused code and variables still hanging around. Cc: David Taht <d@teklibre.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/frontier/alphatrack.c24
-rw-r--r--drivers/staging/frontier/alphatrack.h25
-rw-r--r--drivers/staging/frontier/tranzport.c11
3 files changed, 0 insertions, 60 deletions
diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index 028873e70fe..61d7c5df87a 100644
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -100,16 +100,10 @@ static int debug = 0;
/* Use our own dbg macro */
#define dbg_info(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
-#if 0
-#define alphatrack_ocmd_info(dev, cmd, format, arg...) do { if (debug) ocmd_info(dev , cmd , format, ## arg); } while (0)
-
-#define alphatrack_icmd_info(dev, cmd, format, arg...) do { if (debug) icmd_info(dev , cmd, format, ## arg); } while (0)
-#else
#define alphatrack_ocmd_info(dev, cmd, format, arg...)
#define alphatrack_icmd_info(dev, cmd, format, arg...)
-#endif
/* Module parameters */
@@ -197,23 +191,6 @@ static DEFINE_MUTEX(disconnect_mutex);
static struct usb_driver usb_alphatrack_driver;
-static void icmd_info(struct usb_alphatrack *dev, char *cmd, char *str, char *a) {
-/*
-if (dev->verbose) {
-} else {
-}
-*/
-}
-
-static void ocmd_info(struct usb_alphatrack *dev, char *cmd, char *str, char* a) {
-/*
-if (dev->verbose) {
-} else {
-}
-*/
-}
-
-
/**
* usb_alphatrack_abort_transfers
* aborts transfers and frees associated data structures
@@ -254,7 +231,6 @@ static void usb_alphatrack_interrupt_in_callback(struct urb *urb)
struct usb_alphatrack *dev = urb->context;
unsigned int next_ring_head;
int retval = -1;
- int *iptr;
if (urb->status) {
if (urb->status == -ENOENT ||
diff --git a/drivers/staging/frontier/alphatrack.h b/drivers/staging/frontier/alphatrack.h
index 3dd7d54f49a..35c90a90eb0 100644
--- a/drivers/staging/frontier/alphatrack.h
+++ b/drivers/staging/frontier/alphatrack.h
@@ -39,31 +39,6 @@ enum LightID {
LIGHT_LOOP
};
-static const char *Lightname[] = { "eq",
-"out",
-"f2",
-"send",
-"in",
-"f1",
-"pan",
-"undef1",
-"undef2",
-"shift",
-"mute",
-"tracksolo",
-"trackrec",
-"read",
-"write",
-"anysolo",
-"auto",
-"f4",
-"record",
-"window",
-"plugin",
-"f3",
-"loop",
-NULL };
-
#define BUTTONMASK_BATTERY 0x00004000
#define BUTTONMASK_BACKLIGHT 0x00008000
#define BUTTONMASK_FASTFORWARD 0x04000000
diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index 32d9c5084c8..275faa76238 100644
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -138,16 +138,6 @@ enum LightID {
LightPunch
};
-static const char *Lightname[8] = { "LightRecord",
- "LightTracrec",
- "LightTrackmute",
- "LightTrackSolo",
- "LightAnySolo",
- "LightLoop",
- "LightPunch",
- NULL };
-
-
/* Structure to hold all of our device specific stuff */
struct usb_tranzport {
@@ -574,7 +564,6 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
loff_t *ppos)
{
struct usb_tranzport *dev;
- size_t bytes_to_read;
int retval = 0;
#if BUFFERED_READS