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>

diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c
index 3d76efe26acca6a89b1f632da486cd0ca42f26a5..935d5b536db78eb2c40e9ddcc6add5c2d4c70de1 100644 (file)
--- 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,
        spin_lock(&rc->pal_lock);
        list_for_each_entry(pal, &rc->pals, node) {
                if (pal->new_rsv)
-                       pal->new_rsv(rsv);
+                       pal->new_rsv(pal, rsv);
                if (rsv->state == UWB_RSV_STATE_T_ACCEPTED)
                        break;
        }

diff --git a/drivers/uwb/uwb-debug.c b/drivers/uwb/uwb-debug.c
index 88e6ac713817c9a205372df96c899d8934fc366b..217ebaac128d72aedaa31b82d9e7c31e4573f87a 100644 (file)
--- a/drivers/uwb/uwb-debug.c
+++ b/drivers/uwb/uwb-debug.c
@@ -306,13 +306,13 @@ static struct file_operations drp_avail_fops = {
        .owner   = THIS_MODULE,
 };
 
-static void uwb_dbg_new_rsv(struct uwb_rsv *rsv)
+static void uwb_dbg_new_rsv(struct uwb_pal *pal, struct uwb_rsv *rsv)
 {
-       struct uwb_rc *rc = rsv->rc;
+       struct uwb_dbg *dbg = container_of(pal, struct uwb_dbg, pal);
 
-       if (rc->dbg->accept) {
-               list_add_tail(&rsv->pal_node, &rc->dbg->rsvs);
-               uwb_rsv_accept(rsv, uwb_dbg_rsv_cb, NULL);
+       if (dbg->accept) {
+               list_add_tail(&rsv->pal_node, &dbg->rsvs);
+               uwb_rsv_accept(rsv, uwb_dbg_rsv_cb, dbg);
        }
 }
 

diff --git a/include/linux/uwb.h b/include/linux/uwb.h
index c4854848999df0d5f61ae632863b4b232a436153..effd97998fd18c90becd42de411345858f52106b 100644 (file)
--- a/include/linux/uwb.h
+++ b/include/linux/uwb.h
@@ -405,7 +405,7 @@ struct uwb_pal {
        struct list_head node;
        const char *name;
        struct device *device;
-       void (*new_rsv)(struct uwb_rsv *rsv);
+       void (*new_rsv)(struct uwb_pal *pal, struct uwb_rsv *rsv);
 };
 
 void uwb_pal_init(struct uwb_pal *pal);