lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Bluetooth] Use work queue to trigger URB submission

Browse Source 
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:
Marcel Holtmann
2006-10-15 17:31:19 +02:00
committed by David S. Miller
parent 74da626a10
commit 3f5306927d
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/bluetooth/bcm203x.c
View File

@@ -29,7 +29,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/timer.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/firmware.h> #include <linux/firmware.h>
@@ -43,7 +42,7 @@
#define BT_DBG(D...) #define BT_DBG(D...)
#endif #endif
#define VERSION "1.0" #define VERSION "1.1"
static int ignore = 0; static int ignore = 0;
@@ -72,7 +71,7 @@ struct bcm203x_data {
unsigned long state; unsigned long state;
struct timer_list timer; struct work_struct work;
struct urb *urb; struct urb *urb;
unsigned char *buffer; unsigned char *buffer;
@@ -105,7 +104,7 @@ static void bcm203x_complete(struct urb *urb)
data->state = BCM203X_SELECT_MEMORY; data->state = BCM203X_SELECT_MEMORY;
mod_timer(&data->timer, jiffies + (HZ / 10)); schedule_work(&data->work);
break; break;
case BCM203X_SELECT_MEMORY: 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) if (usb_submit_urb(data->urb, GFP_ATOMIC) < 0)
BT_ERR("Can't submit URB"); 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); release_firmware(firmware);
init_timer(&data->timer); INIT_WORK(&data->work, bcm203x_work, (void *) data);
data->timer.function = bcm203x_timer;
data->timer.data = (unsigned long) data;
usb_set_intfdata(intf, data); usb_set_intfdata(intf, data);
mod_timer(&data->timer, jiffies + HZ); schedule_work(&data->work);
return 0; return 0;
} }