leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] mceusb: remove pointless mce_flush_rx_buffer function

Browse Source 
This function just submits the urb much like mceusb_dev_resume; removing
it simplifies mce_request_packet.

Also add missing usb_kill_urb to mce_dev_probe.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Sean Young 2016-04-14 17:42:50 -03:00 committed by Mauro Carvalho Chehab
parent d26cec2268
commit e1159cb357
1 changed files with 33 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/media/rc/mceusb.c
View File

@ -153,9 +153,6 @@
#define MCE_COMMAND_IRDATA 0x80 #define MCE_COMMAND_IRDATA 0x80
#define MCE_PACKET_LENGTH_MASK 0x1f /* Packet length mask */ #define MCE_PACKET_LENGTH_MASK 0x1f /* Packet length mask */
#define MCEUSB_RX 1
#define MCEUSB_TX 2
#define VENDOR_PHILIPS 0x0471 #define VENDOR_PHILIPS 0x0471
#define VENDOR_SMK 0x0609 #define VENDOR_SMK 0x0609
#define VENDOR_TATUNG 0x1460 #define VENDOR_TATUNG 0x1460
@ -730,23 +727,21 @@ static void mce_async_callback(struct urb *urb)
/* request incoming or send outgoing usb packet - used to initialize remote */ /* request incoming or send outgoing usb packet - used to initialize remote */
static void mce_request_packet(struct mceusb_dev *ir, unsigned char *data, static void mce_request_packet(struct mceusb_dev *ir, unsigned char *data,
int size, int urb_type) int size)
{ {
int res, pipe; int res, pipe;
struct urb *async_urb; struct urb *async_urb;
struct device *dev = ir->dev; struct device *dev = ir->dev;
unsigned char *async_buf; unsigned char *async_buf;
if (urb_type == MCEUSB_TX) {
async_urb = usb_alloc_urb(0, GFP_KERNEL); async_urb = usb_alloc_urb(0, GFP_KERNEL);
if (unlikely(!async_urb)) { if (unlikely(!async_urb)) {
dev_err(dev, "Error, couldn't allocate urb!\n"); dev_err(dev, "Error, couldn't allocate urb!\n");
return; return;
} }
async_buf = kzalloc(size, GFP_KERNEL); async_buf = kmalloc(size, GFP_KERNEL);
if (!async_buf) { if (!async_buf) {
dev_err(dev, "Error, couldn't allocate buf!\n");
usb_free_urb(async_urb); usb_free_urb(async_urb);
return; return;
} }
@ -767,14 +762,6 @@ static void mce_request_packet(struct mceusb_dev *ir, unsigned char *data,
} }
memcpy(async_buf, data, size); memcpy(async_buf, data, size);
} else if (urb_type == MCEUSB_RX) {
/* standard request */
async_urb = ir->urb_in;
} else {
dev_err(dev, "Error! Unknown urb type %d\n", urb_type);
return;
}
dev_dbg(dev, "receive request called (size=%#x)", size); dev_dbg(dev, "receive request called (size=%#x)", size);
async_urb->transfer_buffer_length = size; async_urb->transfer_buffer_length = size;
@ -794,19 +781,14 @@ static void mce_async_out(struct mceusb_dev *ir, unsigned char *data, int size)
if (ir->need_reset) { if (ir->need_reset) {
ir->need_reset = false; ir->need_reset = false;
mce_request_packet(ir, DEVICE_RESUME, rsize, MCEUSB_TX); mce_request_packet(ir, DEVICE_RESUME, rsize);
msleep(10); msleep(10);
} }
mce_request_packet(ir, data, size, MCEUSB_TX); mce_request_packet(ir, data, size);
msleep(10); msleep(10);
} }
static void mce_flush_rx_buffer(struct mceusb_dev *ir, int size)
{
mce_request_packet(ir, NULL, size, MCEUSB_RX);
}
/* Send data out the IR blaster port(s) */ /* Send data out the IR blaster port(s) */
static int mceusb_tx_ir(struct rc_dev *dev, unsigned *txbuf, unsigned count) static int mceusb_tx_ir(struct rc_dev *dev, unsigned *txbuf, unsigned count)
{ {
@ -1264,7 +1246,7 @@ static int mceusb_dev_probe(struct usb_interface *intf,
struct usb_endpoint_descriptor *ep_in = NULL; struct usb_endpoint_descriptor *ep_in = NULL;
struct usb_endpoint_descriptor *ep_out = NULL; struct usb_endpoint_descriptor *ep_out = NULL;
struct mceusb_dev *ir = NULL; struct mceusb_dev *ir = NULL;
int pipe, maxp, i; int pipe, maxp, i, res;
char buf[63], name[128] = ""; char buf[63], name[128] = "";
enum mceusb_model_type model = id->driver_info; enum mceusb_model_type model = id->driver_info;
bool is_gen3; bool is_gen3;
@ -1367,7 +1349,9 @@ static int mceusb_dev_probe(struct usb_interface *intf,
/* flush buffers on the device */ /* flush buffers on the device */
dev_dbg(&intf->dev, "Flushing receive buffers\n"); dev_dbg(&intf->dev, "Flushing receive buffers\n");
mce_flush_rx_buffer(ir, maxp); res = usb_submit_urb(ir->urb_in, GFP_KERNEL);
if (res)
dev_err(&intf->dev, "failed to flush buffers: %d\n", res);
/* figure out which firmware/emulator version this hardware has */ /* figure out which firmware/emulator version this hardware has */
mceusb_get_emulator_version(ir); mceusb_get_emulator_version(ir);
@ -1402,6 +1386,7 @@ static int mceusb_dev_probe(struct usb_interface *intf,
/* Error-handling path */ /* Error-handling path */
rc_dev_fail: rc_dev_fail:
usb_put_dev(ir->usbdev); usb_put_dev(ir->usbdev);
usb_kill_urb(ir->urb_in);
usb_free_urb(ir->urb_in); usb_free_urb(ir->urb_in);
urb_in_alloc_fail: urb_in_alloc_fail:
usb_free_coherent(dev, maxp, ir->buf_in, ir->dma_in); usb_free_coherent(dev, maxp, ir->buf_in, ir->dma_in);