Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

Browse source
This commit is contained in:
David S. Miller 2009-05-04 21:31:29 -07:00
commit bc83871e83
3 changed files with 45 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/net/bluetooth/hci_core.h
View file

@ -457,6 +457,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count);
int hci_register_sysfs(struct hci_dev *hdev); int hci_register_sysfs(struct hci_dev *hdev);
void hci_unregister_sysfs(struct hci_dev *hdev); void hci_unregister_sysfs(struct hci_dev *hdev);
void hci_conn_init_sysfs(struct hci_conn *conn);
void hci_conn_add_sysfs(struct hci_conn *conn); void hci_conn_add_sysfs(struct hci_conn *conn);
void hci_conn_del_sysfs(struct hci_conn *conn); void hci_conn_del_sysfs(struct hci_conn *conn);

2
net/bluetooth/hci_conn.c
View file

@ -248,6 +248,8 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
if (hdev->notify) if (hdev->notify)
hdev->notify(hdev, HCI_NOTIFY_CONN_ADD); hdev->notify(hdev, HCI_NOTIFY_CONN_ADD);
hci_conn_init_sysfs(conn);
tasklet_enable(&hdev->tx_task); tasklet_enable(&hdev->tx_task);
return conn; return conn;

78
net/bluetooth/hci_sysfs.c
View file

@ -9,7 +9,7 @@
struct class *bt_class = NULL; struct class *bt_class = NULL;
EXPORT_SYMBOL_GPL(bt_class); EXPORT_SYMBOL_GPL(bt_class);
static struct workqueue_struct *bluetooth; static struct workqueue_struct *bt_workq;
static inline char *link_typetostr(int type) static inline char *link_typetostr(int type)
{ {
@ -89,8 +89,8 @@ static void add_conn(struct work_struct *work)
{ {
struct hci_conn *conn = container_of(work, struct hci_conn, work_add); struct hci_conn *conn = container_of(work, struct hci_conn, work_add);
/* ensure previous add/del is complete */ /* ensure previous del is complete */
flush_workqueue(bluetooth); flush_work(&conn->work_del);
if (device_add(&conn->dev) < 0) { if (device_add(&conn->dev) < 0) {
BT_ERR("Failed to register connection device"); BT_ERR("Failed to register connection device");
@ -98,27 +98,6 @@ static void add_conn(struct work_struct *work)
} }
} }
void hci_conn_add_sysfs(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
BT_DBG("conn %p", conn);
conn->dev.type = &bt_link;
conn->dev.class = bt_class;
conn->dev.parent = &hdev->dev;
dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);
dev_set_drvdata(&conn->dev, conn);
device_initialize(&conn->dev);
INIT_WORK(&conn->work_add, add_conn);
queue_work(bluetooth, &conn->work_add);
}
/* /*
* The rfcomm tty device will possibly retain even when conn * The rfcomm tty device will possibly retain even when conn
* is down, and sysfs doesn't support move zombie device, * is down, and sysfs doesn't support move zombie device,
@ -134,8 +113,11 @@ static void del_conn(struct work_struct *work)
struct hci_conn *conn = container_of(work, struct hci_conn, work_del); struct hci_conn *conn = container_of(work, struct hci_conn, work_del);
struct hci_dev *hdev = conn->hdev; struct hci_dev *hdev = conn->hdev;
/* ensure previous add/del is complete */ /* ensure previous add is complete */
flush_workqueue(bluetooth); flush_work(&conn->work_add);
if (!device_is_registered(&conn->dev))
return;
while (1) { while (1) {
struct device *dev; struct device *dev;
@ -152,16 +134,40 @@ static void del_conn(struct work_struct *work)
hci_dev_put(hdev); hci_dev_put(hdev);
} }
void hci_conn_init_sysfs(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
BT_DBG("conn %p", conn);
conn->dev.type = &bt_link;
conn->dev.class = bt_class;
conn->dev.parent = &hdev->dev;
dev_set_drvdata(&conn->dev, conn);
device_initialize(&conn->dev);
INIT_WORK(&conn->work_add, add_conn);
INIT_WORK(&conn->work_del, del_conn);
}
void hci_conn_add_sysfs(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
BT_DBG("conn %p", conn);
dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);
queue_work(bt_workq, &conn->work_add);
}
void hci_conn_del_sysfs(struct hci_conn *conn) void hci_conn_del_sysfs(struct hci_conn *conn)
{ {
BT_DBG("conn %p", conn); BT_DBG("conn %p", conn);
if (!device_is_registered(&conn->dev)) queue_work(bt_workq, &conn->work_del);
return;
INIT_WORK(&conn->work_del, del_conn);
queue_work(bluetooth, &conn->work_del);
} }
static inline char *host_typetostr(int type) static inline char *host_typetostr(int type)
@ -438,13 +444,13 @@ void hci_unregister_sysfs(struct hci_dev *hdev)
int __init bt_sysfs_init(void) int __init bt_sysfs_init(void)
{ {
bluetooth = create_singlethread_workqueue("bluetooth"); bt_workq = create_singlethread_workqueue("bluetooth");
if (!bluetooth) if (!bt_workq)
return -ENOMEM; return -ENOMEM;
bt_class = class_create(THIS_MODULE, "bluetooth"); bt_class = class_create(THIS_MODULE, "bluetooth");
if (IS_ERR(bt_class)) { if (IS_ERR(bt_class)) {
destroy_workqueue(bluetooth); destroy_workqueue(bt_workq);
return PTR_ERR(bt_class); return PTR_ERR(bt_class);
} }
@ -453,7 +459,7 @@ int __init bt_sysfs_init(void)
void bt_sysfs_cleanup(void) void bt_sysfs_cleanup(void)
{ {
destroy_workqueue(bluetooth); destroy_workqueue(bt_workq);
class_destroy(bt_class); class_destroy(bt_class);
} }