git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
usb
/
mon
/
mon_main.c
diff --git
a/drivers/usb/mon/mon_main.c
b/drivers/usb/mon/mon_main.c
index
275a66f
..
c34944c
100644
(file)
--- a/
drivers/usb/mon/mon_main.c
+++ b/
drivers/usb/mon/mon_main.c
@@
-12,7
+12,6
@@
#include <linux/debugfs.h>
#include <linux/smp_lock.h>
#include <linux/notifier.h>
#include <linux/debugfs.h>
#include <linux/smp_lock.h>
#include <linux/notifier.h>
-#include <linux/mutex.h>
#include "usb_mon.h"
#include "../core/hcd.h"
#include "usb_mon.h"
#include "../core/hcd.h"
@@
-24,7
+23,7
@@
static void mon_dissolve(struct mon_bus *mbus, struct usb_bus *ubus);
static void mon_bus_drop(struct kref *r);
static void mon_bus_init(struct dentry *mondir, struct usb_bus *ubus);
static void mon_bus_drop(struct kref *r);
static void mon_bus_init(struct dentry *mondir, struct usb_bus *ubus);
-DE
FIN
E_MUTEX(mon_lock);
+DE
CLAR
E_MUTEX(mon_lock);
static struct dentry *mon_dir; /* /dbg/usbmon */
static LIST_HEAD(mon_buses); /* All buses we know: struct mon_bus */
static struct dentry *mon_dir; /* /dbg/usbmon */
static LIST_HEAD(mon_buses); /* All buses we know: struct mon_bus */
@@
-97,7
+96,6
@@
static void mon_submit(struct usb_bus *ubus, struct urb *urb)
if (mbus->nreaders == 0)
goto out_locked;
if (mbus->nreaders == 0)
goto out_locked;
- mbus->cnt_events++;
list_for_each (pos, &mbus->r_list) {
r = list_entry(pos, struct mon_reader, r_link);
r->rnf_submit(r->r_data, urb);
list_for_each (pos, &mbus->r_list) {
r = list_entry(pos, struct mon_reader, r_link);
r->rnf_submit(r->r_data, urb);
@@
-114,32
+112,20
@@
out_unlocked:
/*
*/
/*
*/
-static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int err
or
)
+static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int err)
{
struct mon_bus *mbus;
{
struct mon_bus *mbus;
- unsigned long flags;
- struct list_head *pos;
- struct mon_reader *r;
mbus = ubus->mon_bus;
if (mbus == NULL)
goto out_unlocked;
mbus = ubus->mon_bus;
if (mbus == NULL)
goto out_unlocked;
- spin_lock_irqsave(&mbus->lock, flags);
- if (mbus->nreaders == 0)
- goto out_locked;
-
- mbus->cnt_events++;
- list_for_each (pos, &mbus->r_list) {
- r = list_entry(pos, struct mon_reader, r_link);
- r->rnf_error(r->r_data, urb, error);
- }
+ /*
+ * XXX Capture the error code and the 'E' event.
+ */
- spin_unlock_irqrestore(&mbus->lock, flags);
return;
return;
-out_locked:
- spin_unlock_irqrestore(&mbus->lock, flags);
out_unlocked:
return;
}
out_unlocked:
return;
}
@@
-165,7
+151,6
@@
static void mon_complete(struct usb_bus *ubus, struct urb *urb)
}
spin_lock_irqsave(&mbus->lock, flags);
}
spin_lock_irqsave(&mbus->lock, flags);
- mbus->cnt_events++;
list_for_each (pos, &mbus->r_list) {
r = list_entry(pos, struct mon_reader, r_link);
r->rnf_complete(r->r_data, urb);
list_for_each (pos, &mbus->r_list) {
r = list_entry(pos, struct mon_reader, r_link);
r->rnf_complete(r->r_data, urb);
@@
-177,6
+162,7
@@
static void mon_complete(struct usb_bus *ubus, struct urb *urb)
/*
* Stop monitoring.
/*
* Stop monitoring.
+ * Obviously this must be well locked, so no need to play with mb's.
*/
static void mon_stop(struct mon_bus *mbus)
{
*/
static void mon_stop(struct mon_bus *mbus)
{
@@
-210,14
+196,14
@@
static void mon_bus_remove(struct usb_bus *ubus)
{
struct mon_bus *mbus = ubus->mon_bus;
{
struct mon_bus *mbus = ubus->mon_bus;
-
mutex_lock
(&mon_lock);
+
down
(&mon_lock);
list_del(&mbus->bus_link);
debugfs_remove(mbus->dent_t);
debugfs_remove(mbus->dent_s);
mon_dissolve(mbus, ubus);
kref_put(&mbus->ref, mon_bus_drop);
list_del(&mbus->bus_link);
debugfs_remove(mbus->dent_t);
debugfs_remove(mbus->dent_s);
mon_dissolve(mbus, ubus);
kref_put(&mbus->ref, mon_bus_drop);
-
mutex_unlock
(&mon_lock);
+
up
(&mon_lock);
}
static int mon_notify(struct notifier_block *self, unsigned long action,
}
static int mon_notify(struct notifier_block *self, unsigned long action,
@@
-290,8
+276,9
@@
static void mon_bus_init(struct dentry *mondir, struct usb_bus *ubus)
char name[NAMESZ];
int rc;
char name[NAMESZ];
int rc;
- if ((mbus = k
z
alloc(sizeof(struct mon_bus), GFP_KERNEL)) == NULL)
+ if ((mbus = k
m
alloc(sizeof(struct mon_bus), GFP_KERNEL)) == NULL)
goto err_alloc;
goto err_alloc;
+ memset(mbus, 0, sizeof(struct mon_bus));
kref_init(&mbus->ref);
spin_lock_init(&mbus->lock);
INIT_LIST_HEAD(&mbus->r_list);
kref_init(&mbus->ref);
spin_lock_init(&mbus->lock);
INIT_LIST_HEAD(&mbus->r_list);
@@
-320,9
+307,9
@@
static void mon_bus_init(struct dentry *mondir, struct usb_bus *ubus)
goto err_create_s;
mbus->dent_s = d;
goto err_create_s;
mbus->dent_s = d;
-
mutex_lock
(&mon_lock);
+
down
(&mon_lock);
list_add_tail(&mbus->bus_link, &mon_buses);
list_add_tail(&mbus->bus_link, &mon_buses);
-
mutex_unlock
(&mon_lock);
+
up
(&mon_lock);
return;
err_create_s:
return;
err_create_s:
@@
-360,11
+347,11
@@
static int __init mon_init(void)
usb_register_notify(&mon_nb);
usb_register_notify(&mon_nb);
-
mutex_lock
(&usb_bus_list_lock);
+
down
(&usb_bus_list_lock);
list_for_each_entry (ubus, &usb_bus_list, bus_list) {
mon_bus_init(mondir, ubus);
}
list_for_each_entry (ubus, &usb_bus_list, bus_list) {
mon_bus_init(mondir, ubus);
}
-
mutex_unlock
(&usb_bus_list_lock);
+
up
(&usb_bus_list_lock);
return 0;
}
return 0;
}
@@
-376,7
+363,7
@@
static void __exit mon_exit(void)
usb_unregister_notify(&mon_nb);
usb_mon_deregister();
usb_unregister_notify(&mon_nb);
usb_mon_deregister();
-
mutex_lock
(&mon_lock);
+
down
(&mon_lock);
while (!list_empty(&mon_buses)) {
p = mon_buses.next;
mbus = list_entry(p, struct mon_bus, bus_link);
while (!list_empty(&mon_buses)) {
p = mon_buses.next;
mbus = list_entry(p, struct mon_bus, bus_link);
@@
-400,7
+387,7
@@
static void __exit mon_exit(void)
mon_dissolve(mbus, mbus->u_bus);
kref_put(&mbus->ref, mon_bus_drop);
}
mon_dissolve(mbus, mbus->u_bus);
kref_put(&mbus->ref, mon_bus_drop);
}
-
mutex_unlock
(&mon_lock);
+
up
(&mon_lock);
debugfs_remove(mon_dir);
}
debugfs_remove(mon_dir);
}