projects / deliverable / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[deliverable/linux.git] / net / irda / iriap.c
diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index e1b37f5a2691f7a79052f9b840aa0f9910182698..4a7ae32afa09b90fab1d57bcb807ca2b8a1200c6 100644 (file)
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -43,9 +43,8 @@
 #include <net/irda/iriap_event.h>
 #include <net/irda/iriap.h>
 
-#ifdef CONFIG_IRDA_DEBUG
 /* FIXME: This one should go in irlmp.c */
-static const char *const ias_charset_types[] = {
+static const char *const ias_charset_types[] __maybe_unused = {
        "CS_ASCII",
        "CS_ISO_8859_1",
        "CS_ISO_8859_2",
@@ -58,7 +57,6 @@ static const char *const ias_charset_types[] = {
        "CS_ISO_8859_9",
        "CS_UNICODE"
 };
-#endif /* CONFIG_IRDA_DEBUG */
 
 static hashbin_t *iriap = NULL;
 static void *service_handle;
@@ -110,8 +108,8 @@ int __init iriap_init(void)
        /* Object repository - defined in irias_object.c */
        irias_objects = hashbin_new(HB_LOCK);
        if (!irias_objects) {
-               IRDA_WARNING("%s: Can't allocate irias_objects hashbin!\n",
-                            __func__);
+               net_warn_ratelimited("%s: Can't allocate irias_objects hashbin!\n",
+                                    __func__);
                hashbin_delete(iriap, NULL);
                return -ENOMEM;
        }
@@ -145,7 +143,7 @@ int __init iriap_init(void)
         */
        server = iriap_open(LSAP_IAS, IAS_SERVER, NULL, NULL);
        if (!server) {
-               IRDA_DEBUG(0, "%s(), unable to open server\n", __func__);
+               pr_debug("%s(), unable to open server\n", __func__);
                return -1;
        }
        iriap_register_lsap(server, LSAP_IAS, IAS_SERVER);
@@ -177,13 +175,9 @@ struct iriap_cb *iriap_open(__u8 slsap_sel, int mode, void *priv,
 {
        struct iriap_cb *self;
 
-       IRDA_DEBUG(2, "%s()\n", __func__);
-
        self = kzalloc(sizeof(*self), GFP_ATOMIC);
-       if (!self) {
-               IRDA_WARNING("%s: Unable to kmalloc!\n", __func__);
+       if (!self)
                return NULL;
-       }
 
        /*
         *  Initialize instance
@@ -223,8 +217,6 @@ EXPORT_SYMBOL(iriap_open);
  */
 static void __iriap_close(struct iriap_cb *self)
 {
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
 
@@ -247,8 +239,6 @@ void iriap_close(struct iriap_cb *self)
 {
        struct iriap_cb *entry;
 
-       IRDA_DEBUG(2, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
 
@@ -268,8 +258,6 @@ static int iriap_register_lsap(struct iriap_cb *self, __u8 slsap_sel, int mode)
 {
        notify_t notify;
 
-       IRDA_DEBUG(2, "%s()\n", __func__);
-
        irda_notify_init(&notify);
        notify.connect_confirm       = iriap_connect_confirm;
        notify.connect_indication    = iriap_connect_indication;
@@ -283,7 +271,8 @@ static int iriap_register_lsap(struct iriap_cb *self, __u8 slsap_sel, int mode)
 
        self->lsap = irlmp_open_lsap(slsap_sel, &notify, 0);
        if (self->lsap == NULL) {
-               IRDA_ERROR("%s: Unable to allocated LSAP!\n", __func__);
+               net_err_ratelimited("%s: Unable to allocated LSAP!\n",
+                                   __func__);
                return -1;
        }
        self->slsap_sel = self->lsap->slsap_sel;
@@ -303,8 +292,8 @@ static void iriap_disconnect_indication(void *instance, void *sap,
 {
        struct iriap_cb *self;
 
-       IRDA_DEBUG(4, "%s(), reason=%s [%d]\n", __func__,
-                  irlmp_reason_str(reason), reason);
+       pr_debug("%s(), reason=%s [%d]\n", __func__,
+                irlmp_reason_str(reason), reason);
 
        self = instance;
 
@@ -320,7 +309,7 @@ static void iriap_disconnect_indication(void *instance, void *sap,
                dev_kfree_skb(skb);
 
        if (self->mode == IAS_CLIENT) {
-               IRDA_DEBUG(4, "%s(), disconnect as client\n", __func__);
+               pr_debug("%s(), disconnect as client\n", __func__);
 
 
                iriap_do_client_event(self, IAP_LM_DISCONNECT_INDICATION,
@@ -333,7 +322,7 @@ static void iriap_disconnect_indication(void *instance, void *sap,
                if (self->confirm)
                        self->confirm(IAS_DISCONNECT, 0, NULL, self->priv);
        } else {
-               IRDA_DEBUG(4, "%s(), disconnect as server\n", __func__);
+               pr_debug("%s(), disconnect as server\n", __func__);
                iriap_do_server_event(self, IAP_LM_DISCONNECT_INDICATION,
                                      NULL);
                iriap_close(self);
@@ -347,16 +336,13 @@ static void iriap_disconnect_request(struct iriap_cb *self)
 {
        struct sk_buff *tx_skb;
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
 
        tx_skb = alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC);
        if (tx_skb == NULL) {
-               IRDA_DEBUG(0,
-                          "%s(), Could not allocate an sk_buff of length %d\n",
-                          __func__, LMP_MAX_HEADER);
+               pr_debug("%s(), Could not allocate an sk_buff of length %d\n",
+                        __func__, LMP_MAX_HEADER);
                return;
        }
 
@@ -461,14 +447,14 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
        len = get_unaligned_be16(fp + n);
        n += 2;
 
-       IRDA_DEBUG(4, "%s(), len=%d\n", __func__, len);
+       pr_debug("%s(), len=%d\n", __func__, len);
 
        /* Get object ID, MSB first */
        obj_id = get_unaligned_be16(fp + n);
        n += 2;
 
        type = fp[n++];
-       IRDA_DEBUG(4, "%s(), Value type = %d\n", __func__, type);
+       pr_debug("%s(), Value type = %d\n", __func__, type);
 
        switch (type) {
        case IAS_INTEGER:
@@ -477,7 +463,7 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
                value = irias_new_integer_value(tmp_cpu32);
 
                /*  Legal values restricted to 0x01-0x6f, page 15 irttp */
-               IRDA_DEBUG(4, "%s(), lsap=%d\n", __func__, value->t.integer);
+               pr_debug("%s(), lsap=%d\n", __func__, value->t.integer);
                break;
        case IAS_STRING:
                charset = fp[n++];
@@ -496,11 +482,11 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
 /*             case CS_ISO_8859_9: */
 /*             case CS_UNICODE: */
                default:
-                       IRDA_DEBUG(0, "%s(), charset [%d] %s, not supported\n",
-                                  __func__, charset,
-                                  charset < ARRAY_SIZE(ias_charset_types) ?
-                                       ias_charset_types[charset] :
-                                       "(unknown)");
+                       pr_debug("%s(), charset [%d] %s, not supported\n",
+                                __func__, charset,
+                                charset < ARRAY_SIZE(ias_charset_types) ?
+                                ias_charset_types[charset] :
+                                "(unknown)");
 
                        /* Aborting, close connection! */
                        iriap_disconnect_request(self);
@@ -508,12 +494,12 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
                        /* break; */
                }
                value_len = fp[n++];
-               IRDA_DEBUG(4, "%s(), strlen=%d\n", __func__, value_len);
+               pr_debug("%s(), strlen=%d\n", __func__, value_len);
 
                /* Make sure the string is null-terminated */
                if (n + value_len < skb->len)
                        fp[n + value_len] = 0x00;
-               IRDA_DEBUG(4, "Got string %s\n", fp+n);
+               pr_debug("Got string %s\n", fp+n);
 
                /* Will truncate to IAS_MAX_STRING bytes */
                value = irias_new_string_value(fp+n);
@@ -539,7 +525,7 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
        if (self->confirm)
                self->confirm(IAS_SUCCESS, obj_id, value, self->priv);
        else {
-               IRDA_DEBUG(0, "%s(), missing handler!\n", __func__);
+               pr_debug("%s(), missing handler!\n", __func__);
                irias_delete_value(value);
        }
 }
@@ -561,8 +547,6 @@ static void iriap_getvaluebyclass_response(struct iriap_cb *self,
        __be16 tmp_be16;
        __u8 *fp;
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
        IRDA_ASSERT(value != NULL, return;);
@@ -623,12 +607,12 @@ static void iriap_getvaluebyclass_response(struct iriap_cb *self,
                memcpy(fp+n, value->t.oct_seq, value->len); n+=value->len;
                break;
        case IAS_MISSING:
-               IRDA_DEBUG( 3, "%s: sending IAS_MISSING\n", __func__);
+               pr_debug("%s: sending IAS_MISSING\n", __func__);
                skb_put(tx_skb, 1);
                fp[n++] = value->type;
                break;
        default:
-               IRDA_DEBUG(0, "%s(), type not implemented!\n", __func__);
+               pr_debug("%s(), type not implemented!\n", __func__);
                break;
        }
        iriap_do_r_connect_event(self, IAP_CALL_RESPONSE, tx_skb);
@@ -655,8 +639,6 @@ static void iriap_getvaluebyclass_indication(struct iriap_cb *self,
        __u8 *fp;
        int n;
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
        IRDA_ASSERT(skb != NULL, return;);
@@ -678,20 +660,20 @@ static void iriap_getvaluebyclass_indication(struct iriap_cb *self,
        memcpy(attr, fp+n, attr_len); n+=attr_len;
        attr[attr_len] = '\0';
 
-       IRDA_DEBUG(4, "LM-IAS: Looking up %s: %s\n", name, attr);
+       pr_debug("LM-IAS: Looking up %s: %s\n", name, attr);
        obj = irias_find_object(name);
 
        if (obj == NULL) {
-               IRDA_DEBUG(2, "LM-IAS: Object %s not found\n", name);
+               pr_debug("LM-IAS: Object %s not found\n", name);
                iriap_getvaluebyclass_response(self, 0x1235, IAS_CLASS_UNKNOWN,
                                               &irias_missing);
                return;
        }
-       IRDA_DEBUG(4, "LM-IAS: found %s, id=%d\n", obj->name, obj->id);
+       pr_debug("LM-IAS: found %s, id=%d\n", obj->name, obj->id);
 
        attrib = irias_find_attrib(obj, attr);
        if (attrib == NULL) {
-               IRDA_DEBUG(2, "LM-IAS: Attribute %s not found\n", attr);
+               pr_debug("LM-IAS: Attribute %s not found\n", attr);
                iriap_getvaluebyclass_response(self, obj->id,
                                               IAS_ATTRIB_UNKNOWN,
                                               &irias_missing);
@@ -714,8 +696,6 @@ void iriap_send_ack(struct iriap_cb *self)
        struct sk_buff *tx_skb;
        __u8 *frame;
 
-       IRDA_DEBUG(2, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
 
@@ -745,7 +725,7 @@ void iriap_connect_request(struct iriap_cb *self)
                                    self->saddr, self->daddr,
                                    NULL, NULL);
        if (ret < 0) {
-               IRDA_DEBUG(0, "%s(), connect failed!\n", __func__);
+               pr_debug("%s(), connect failed!\n", __func__);
                self->confirm(IAS_DISCONNECT, 0, NULL, self->priv);
        }
 }
@@ -793,8 +773,6 @@ static void iriap_connect_indication(void *instance, void *sap,
 {
        struct iriap_cb *self, *new;
 
-       IRDA_DEBUG(1, "%s()\n", __func__);
-
        self = instance;
 
        IRDA_ASSERT(skb != NULL, return;);
@@ -804,14 +782,14 @@ static void iriap_connect_indication(void *instance, void *sap,
        /* Start new server */
        new = iriap_open(LSAP_IAS, IAS_SERVER, NULL, NULL);
        if (!new) {
-               IRDA_DEBUG(0, "%s(), open failed\n", __func__);
+               pr_debug("%s(), open failed\n", __func__);
                goto out;
        }
 
        /* Now attach up the new "socket" */
        new->lsap = irlmp_dup(self->lsap, new);
        if (!new->lsap) {
-               IRDA_DEBUG(0, "%s(), dup failed!\n", __func__);
+               pr_debug("%s(), dup failed!\n", __func__);
                goto out;
        }
 
@@ -841,8 +819,6 @@ static int iriap_data_indication(void *instance, void *sap,
        __u8  *frame;
        __u8  opcode;
 
-       IRDA_DEBUG(3, "%s()\n", __func__);
-
        self = instance;
 
        IRDA_ASSERT(skb != NULL, return 0;);
@@ -853,21 +829,20 @@ static int iriap_data_indication(void *instance, void *sap,
 
        if (self->mode == IAS_SERVER) {
                /* Call server */
-               IRDA_DEBUG(4, "%s(), Calling server!\n", __func__);
+               pr_debug("%s(), Calling server!\n", __func__);
                iriap_do_r_connect_event(self, IAP_RECV_F_LST, skb);
                goto out;
        }
        opcode = frame[0];
        if (~opcode & IAP_LST) {
-               IRDA_WARNING("%s:, IrIAS multiframe commands or "
-                            "results is not implemented yet!\n",
-                            __func__);
+               net_warn_ratelimited("%s:, IrIAS multiframe commands or results is not implemented yet!\n",
+                                    __func__);
                goto out;
        }
 
        /* Check for ack frames since they don't contain any data */
        if (opcode & IAP_ACK) {
-               IRDA_DEBUG(0, "%s() Got ack frame!\n", __func__);
+               pr_debug("%s() Got ack frame!\n", __func__);
                goto out;
        }
 
@@ -875,7 +850,7 @@ static int iriap_data_indication(void *instance, void *sap,
 
        switch (opcode) {
        case GET_INFO_BASE:
-               IRDA_DEBUG(0, "IrLMP GetInfoBaseDetails not implemented!\n");
+               pr_debug("IrLMP GetInfoBaseDetails not implemented!\n");
                break;
        case GET_VALUE_BY_CLASS:
                iriap_do_call_event(self, IAP_RECV_F_LST, NULL);
@@ -885,7 +860,7 @@ static int iriap_data_indication(void *instance, void *sap,
                        iriap_getvaluebyclass_confirm(self, skb);
                        break;
                case IAS_CLASS_UNKNOWN:
-                       IRDA_DEBUG(1, "%s(), No such class!\n", __func__);
+                       pr_debug("%s(), No such class!\n", __func__);
                        /* Finished, close connection! */
                        iriap_disconnect_request(self);
 
@@ -898,7 +873,7 @@ static int iriap_data_indication(void *instance, void *sap,
                                              self->priv);
                        break;
                case IAS_ATTRIB_UNKNOWN:
-                       IRDA_DEBUG(1, "%s(), No such attribute!\n", __func__);
+                       pr_debug("%s(), No such attribute!\n", __func__);
                        /* Finished, close connection! */
                        iriap_disconnect_request(self);
 
@@ -913,8 +888,8 @@ static int iriap_data_indication(void *instance, void *sap,
                }
                break;
        default:
-               IRDA_DEBUG(0, "%s(), Unknown op-code: %02x\n", __func__,
-                          opcode);
+               pr_debug("%s(), Unknown op-code: %02x\n", __func__,
+                        opcode);
                break;
        }
 
@@ -935,8 +910,6 @@ void iriap_call_indication(struct iriap_cb *self, struct sk_buff *skb)
        __u8 *fp;
        __u8 opcode;
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
        IRDA_ASSERT(skb != NULL, return;);
@@ -945,16 +918,16 @@ void iriap_call_indication(struct iriap_cb *self, struct sk_buff *skb)
 
        opcode = fp[0];
        if (~opcode & 0x80) {
-               IRDA_WARNING("%s: IrIAS multiframe commands or results "
-                            "is not implemented yet!\n", __func__);
+               net_warn_ratelimited("%s: IrIAS multiframe commands or results is not implemented yet!\n",
+                                    __func__);
                return;
        }
        opcode &= 0x7f; /* Mask away LST bit */
 
        switch (opcode) {
        case GET_INFO_BASE:
-               IRDA_WARNING("%s: GetInfoBaseDetails not implemented yet!\n",
-                            __func__);
+               net_warn_ratelimited("%s: GetInfoBaseDetails not implemented yet!\n",
+                                    __func__);
                break;
        case GET_VALUE_BY_CLASS:
                iriap_getvaluebyclass_indication(self, skb);
Linux kernel - Deliverables
This page took 0.041613 seconds and 5 git commands to generate.