diff options
author | David Vrabel <david.vrabel@csr.com> | 2008-11-17 10:24:14 -0500 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2008-11-17 10:24:14 -0500 |
commit | e17be2b2a95b43fe0d5878adf330701bb7a77115 (patch) | |
tree | 90810d325dcdbf6fb73c16a6324cefa42a3e2e16 | |
parent | 58be81ed301d96045bca2b85f3b838910efcfde4 (diff) |
uwb: add pal parameter to new reservation callback
The pal parameter allows PALs to retrieve their PAL-specific data
structure.
Signed-off-by: David Vrabel <david.vrabel@csr.com>
-rw-r--r-- | drivers/uwb/rsv.c | 2 | ||||
-rw-r--r-- | drivers/uwb/uwb-debug.c | 10 | ||||
-rw-r--r-- | include/linux/uwb.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c index 3d76efe26ac..935d5b536db 100644 --- a/drivers/uwb/rsv.c +++ b/drivers/uwb/rsv.c | |||
@@ -558,7 +558,7 @@ static struct uwb_rsv *uwb_rsv_new_target(struct uwb_rc *rc, | |||
558 | spin_lock(&rc->pal_lock); | 558 | spin_lock(&rc->pal_lock); |
559 | list_for_each_entry(pal, &rc->pals, node) { | 559 | list_for_each_entry(pal, &rc->pals, node) { |
560 | if (pal->new_rsv) | 560 | if (pal->new_rsv) |
561 | pal->new_rsv(rsv); | 561 | pal->new_rsv(pal, rsv); |
562 | if (rsv->state == UWB_RSV_STATE_T_ACCEPTED) | 562 | if (rsv->state == UWB_RSV_STATE_T_ACCEPTED) |
563 | break; | 563 | break; |
564 | } | 564 | } |
diff --git a/drivers/uwb/uwb-debug.c b/drivers/uwb/uwb-debug.c index 88e6ac71381..217ebaac128 100644 --- a/drivers/uwb/uwb-debug.c +++ b/drivers/uwb/uwb-debug.c | |||
@@ -306,13 +306,13 @@ static struct file_operations drp_avail_fops = { | |||
306 | .owner = THIS_MODULE, | 306 | .owner = THIS_MODULE, |
307 | }; | 307 | }; |
308 | 308 | ||
309 | static void uwb_dbg_new_rsv(struct uwb_rsv *rsv) | 309 | static void uwb_dbg_new_rsv(struct uwb_pal *pal, struct uwb_rsv *rsv) |
310 | { | 310 | { |
311 | struct uwb_rc *rc = rsv->rc; | 311 | struct uwb_dbg *dbg = container_of(pal, struct uwb_dbg, pal); |
312 | 312 | ||
313 | if (rc->dbg->accept) { | 313 | if (dbg->accept) { |
314 | list_add_tail(&rsv->pal_node, &rc->dbg->rsvs); | 314 | list_add_tail(&rsv->pal_node, &dbg->rsvs); |
315 | uwb_rsv_accept(rsv, uwb_dbg_rsv_cb, NULL); | 315 | uwb_rsv_accept(rsv, uwb_dbg_rsv_cb, dbg); |
316 | } | 316 | } |
317 | } | 317 | } |
318 | 318 | ||
diff --git a/include/linux/uwb.h b/include/linux/uwb.h index c4854848999..effd97998fd 100644 --- a/include/linux/uwb.h +++ b/include/linux/uwb.h | |||
@@ -405,7 +405,7 @@ struct uwb_pal { | |||
405 | struct list_head node; | 405 | struct list_head node; |
406 | const char *name; | 406 | const char *name; |
407 | struct device *device; | 407 | struct device *device; |
408 | void (*new_rsv)(struct uwb_rsv *rsv); | 408 | void (*new_rsv)(struct uwb_pal *pal, struct uwb_rsv *rsv); |
409 | }; | 409 | }; |
410 | 410 | ||
411 | void uwb_pal_init(struct uwb_pal *pal); | 411 | void uwb_pal_init(struct uwb_pal *pal); |