aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/frontier
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-12-17 20:20:23 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 16:52:36 -0500
commit37bcd24b845abbfd85c838ee9ce07c2b254d3a05 (patch)
tree457da44faafc258df108aec26f6385887bd6f4fd /drivers/staging/frontier
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/frontier')
-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;
100/* Use our own dbg macro */ 100/* Use our own dbg macro */
101#define dbg_info(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0) 101#define dbg_info(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
102 102
103#if 0
104#define alphatrack_ocmd_info(dev, cmd, format, arg...) do { if (debug) ocmd_info(dev , cmd , format, ## arg); } while (0)
105
106#define alphatrack_icmd_info(dev, cmd, format, arg...) do { if (debug) icmd_info(dev , cmd, format, ## arg); } while (0)
107#else
108#define alphatrack_ocmd_info(dev, cmd, format, arg...) 103#define alphatrack_ocmd_info(dev, cmd, format, arg...)
109 104
110#define alphatrack_icmd_info(dev, cmd, format, arg...) 105#define alphatrack_icmd_info(dev, cmd, format, arg...)
111 106
112#endif
113 107
114/* Module parameters */ 108/* Module parameters */
115 109
@@ -197,23 +191,6 @@ static DEFINE_MUTEX(disconnect_mutex);
197 191
198static struct usb_driver usb_alphatrack_driver; 192static struct usb_driver usb_alphatrack_driver;
199 193
200static void icmd_info(struct usb_alphatrack *dev, char *cmd, char *str, char *a) {
201/*
202if (dev->verbose) {
203} else {
204}
205*/
206}
207
208static void ocmd_info(struct usb_alphatrack *dev, char *cmd, char *str, char* a) {
209/*
210if (dev->verbose) {
211} else {
212}
213*/
214}
215
216
217/** 194/**
218 * usb_alphatrack_abort_transfers 195 * usb_alphatrack_abort_transfers
219 * aborts transfers and frees associated data structures 196 * aborts transfers and frees associated data structures
@@ -254,7 +231,6 @@ static void usb_alphatrack_interrupt_in_callback(struct urb *urb)
254 struct usb_alphatrack *dev = urb->context; 231 struct usb_alphatrack *dev = urb->context;
255 unsigned int next_ring_head; 232 unsigned int next_ring_head;
256 int retval = -1; 233 int retval = -1;
257 int *iptr;
258 234
259 if (urb->status) { 235 if (urb->status) {
260 if (urb->status == -ENOENT || 236 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 {
39 LIGHT_LOOP 39 LIGHT_LOOP
40}; 40};
41 41
42static const char *Lightname[] = { "eq",
43"out",
44"f2",
45"send",
46"in",
47"f1",
48"pan",
49"undef1",
50"undef2",
51"shift",
52"mute",
53"tracksolo",
54"trackrec",
55"read",
56"write",
57"anysolo",
58"auto",
59"f4",
60"record",
61"window",
62"plugin",
63"f3",
64"loop",
65NULL };
66
67#define BUTTONMASK_BATTERY 0x00004000 42#define BUTTONMASK_BATTERY 0x00004000
68#define BUTTONMASK_BACKLIGHT 0x00008000 43#define BUTTONMASK_BACKLIGHT 0x00008000
69#define BUTTONMASK_FASTFORWARD 0x04000000 44#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 {
138 LightPunch 138 LightPunch
139 }; 139 };
140 140
141static const char *Lightname[8] = { "LightRecord",
142 "LightTracrec",
143 "LightTrackmute",
144 "LightTrackSolo",
145 "LightAnySolo",
146 "LightLoop",
147 "LightPunch",
148 NULL };
149
150
151/* Structure to hold all of our device specific stuff */ 141/* Structure to hold all of our device specific stuff */
152 142
153struct usb_tranzport { 143struct usb_tranzport {
@@ -574,7 +564,6 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
574 loff_t *ppos) 564 loff_t *ppos)
575{ 565{
576 struct usb_tranzport *dev; 566 struct usb_tranzport *dev;
577 size_t bytes_to_read;
578 int retval = 0; 567 int retval = 0;
579 568
580#if BUFFERED_READS 569#if BUFFERED_READS