forked from Minki/linux
[Bluetooth] Use work queue to trigger URB submission
The bcm203x firmware loading driver uses a timer to trigger the URB submission. It is better to use a work queue instead. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
74da626a10
commit
3f5306927d
@ -29,7 +29,6 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/timer.h>
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/firmware.h>
|
||||
@ -43,7 +42,7 @@
|
||||
#define BT_DBG(D...)
|
||||
#endif
|
||||
|
||||
#define VERSION "1.0"
|
||||
#define VERSION "1.1"
|
||||
|
||||
static int ignore = 0;
|
||||
|
||||
@ -72,7 +71,7 @@ struct bcm203x_data {
|
||||
|
||||
unsigned long state;
|
||||
|
||||
struct timer_list timer;
|
||||
struct work_struct work;
|
||||
|
||||
struct urb *urb;
|
||||
unsigned char *buffer;
|
||||
@ -105,7 +104,7 @@ static void bcm203x_complete(struct urb *urb)
|
||||
|
||||
data->state = BCM203X_SELECT_MEMORY;
|
||||
|
||||
mod_timer(&data->timer, jiffies + (HZ / 10));
|
||||
schedule_work(&data->work);
|
||||
break;
|
||||
|
||||
case BCM203X_SELECT_MEMORY:
|
||||
@ -158,9 +157,9 @@ static void bcm203x_complete(struct urb *urb)
|
||||
}
|
||||
}
|
||||
|
||||
static void bcm203x_timer(unsigned long user_data)
|
||||
static void bcm203x_work(void *user_data)
|
||||
{
|
||||
struct bcm203x_data *data = (struct bcm203x_data *) user_data;
|
||||
struct bcm203x_data *data = user_data;
|
||||
|
||||
if (usb_submit_urb(data->urb, GFP_ATOMIC) < 0)
|
||||
BT_ERR("Can't submit URB");
|
||||
@ -247,13 +246,11 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
|
||||
|
||||
release_firmware(firmware);
|
||||
|
||||
init_timer(&data->timer);
|
||||
data->timer.function = bcm203x_timer;
|
||||
data->timer.data = (unsigned long) data;
|
||||
INIT_WORK(&data->work, bcm203x_work, (void *) data);
|
||||
|
||||
usb_set_intfdata(intf, data);
|
||||
|
||||
mod_timer(&data->timer, jiffies + HZ);
|
||||
schedule_work(&data->work);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user