Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126758
b: refs/heads/master
c: 37bcd24
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jan 6, 2009
1 parent 7fddd40 commit f5820ef
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 61 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 006ef0ec96de0dec01064df86febbc813f23c96a
refs/heads/master: 37bcd24b845abbfd85c838ee9ce07c2b254d3a05
24 changes: 0 additions & 24 deletions trunk/drivers/staging/frontier/alphatrack.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ||
Expand Down
25 changes: 0 additions & 25 deletions trunk/drivers/staging/frontier/alphatrack.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions trunk/drivers/staging/frontier/tranzport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f5820ef

Please sign in to comment.