mISDN: Use struct device name field

[linux-2.6-omap-h63xx.git] / drivers / isdn / mISDN / tei.c

diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 6fbae42127bfd8ebcc268db5dc029781d7618ad8..b452dead8fd04e3fc782ec81fe68914c75f7b6b5 100644 (file)
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -393,7 +393,7 @@ dl_unit_data(struct manager *mgr, struct sk_buff *skb)
        return 0;
 }
 
-unsigned int
+static unsigned int
 random_ri(void)
 {
        u16 x;
@@ -968,9 +968,9 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
 
        if (*debug & DEBUG_L2_TEI)
                printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n",
-                       __func__, mgr->ch.st->dev->name, crq->protocol,
-                       crq->adr.dev, crq->adr.channel, crq->adr.sapi,
-                       crq->adr.tei);
+                       __func__, dev_name(&mgr->ch.st->dev->dev),
+                       crq->protocol, crq->adr.dev, crq->adr.channel,
+                       crq->adr.sapi, crq->adr.tei);
        if (crq->adr.sapi != 0) /* not supported yet */
                return -EINVAL;
        if (crq->adr.tei > GROUP_TEI)
@@ -1287,7 +1287,7 @@ create_teimanager(struct mISDNdevice *dev)
        if (!mgr)
                return -ENOMEM;
        INIT_LIST_HEAD(&mgr->layer2);
-       mgr->lock = __RW_LOCK_UNLOCKED(mgr->lock);
+       rwlock_init(&mgr->lock);
        skb_queue_head_init(&mgr->sendq);
        mgr->nextid = 1;
        mgr->lastid = MISDN_ID_NONE;