Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37bcd24b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: frontier: fix compiler warnings 



Basically remove unused code and variables still hanging around.

Cc: David Taht <d@teklibre.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 006ef0ec

drivers/staging/frontier/alphatrack.c

+0 −24
Original line number Original line Diff line number Diff line
@@ -100,16 +100,10 @@ static int debug = 0; 
/* Use our own dbg macro */

/* Use our own dbg macro */

#define dbg_info(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)

#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_ocmd_info(dev, cmd, format, arg...)





#define alphatrack_icmd_info(dev, cmd, format, arg...)

#define alphatrack_icmd_info(dev, cmd, format, arg...)





#endif





/* Module parameters */

/* Module parameters */
@@ -197,23 +191,6 @@ static DEFINE_MUTEX(disconnect_mutex); 




static struct usb_driver usb_alphatrack_driver;

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

 *	usb_alphatrack_abort_transfers

 *      aborts transfers and frees associated data structures

 *      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;

	struct usb_alphatrack *dev = urb->context;

	unsigned int next_ring_head;

	unsigned int next_ring_head;

	int retval = -1;

	int retval = -1;

	int *iptr;





	if (urb->status) {

	if (urb->status) {

		if (urb->status == -ENOENT ||

		if (urb->status == -ENOENT ||

drivers/staging/frontier/alphatrack.h

+0 −25
Original line number Original line Diff line number Diff line
@@ -39,31 +39,6 @@ enum LightID { 
        LIGHT_LOOP

        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_BATTERY     0x00004000

#define BUTTONMASK_BACKLIGHT   0x00008000

#define BUTTONMASK_BACKLIGHT   0x00008000

#define BUTTONMASK_FASTFORWARD 0x04000000

#define BUTTONMASK_FASTFORWARD 0x04000000

drivers/staging/frontier/tranzport.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -138,16 +138,6 @@ enum LightID { 
	LightPunch

	LightPunch

	};

	};





static const char *Lightname[8] = { "LightRecord",

																		"LightTracrec",

																		"LightTrackmute",

																		"LightTrackSolo",

																		"LightAnySolo",

																		"LightLoop",

																		"LightPunch",

																		NULL };





/* Structure to hold all of our device specific stuff */

/* Structure to hold all of our device specific stuff */





struct usb_tranzport {

struct usb_tranzport {
@@ -574,7 +564,6 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t 
			   loff_t *ppos)

			   loff_t *ppos)

{

{

	struct usb_tranzport *dev;

	struct usb_tranzport *dev;

	size_t bytes_to_read;

	int retval = 0;

	int retval = 0;





#if BUFFERED_READS

#if BUFFERED_READS