irda: Remove IRDA_<TYPE> logging macros

[deliverable/linux.git] / net / irda / irias_object.c

diff --git a/net/irda/irias_object.c b/net/irda/irias_object.c
index f07ed9fd5792fabe7e1cffc1016330ee01a0fab8..cd53692fe8c973d23859c3be318227a25bf119a6 100644 (file)
--- a/net/irda/irias_object.c
+++ b/net/irda/irias_object.c
@@ -52,16 +52,16 @@ struct ias_object *irias_new_object( char *name, int id)
 
        obj = kzalloc(sizeof(struct ias_object), GFP_ATOMIC);
        if (obj == NULL) {
-               IRDA_WARNING("%s(), Unable to allocate object!\n",
-                            __func__);
+               net_warn_ratelimited("%s(), Unable to allocate object!\n",
+                                    __func__);
                return NULL;
        }
 
        obj->magic = IAS_OBJECT_MAGIC;
        obj->name = kstrndup(name, IAS_MAX_CLASSNAME, GFP_ATOMIC);
        if (!obj->name) {
-               IRDA_WARNING("%s(), Unable to allocate name!\n",
-                            __func__);
+               net_warn_ratelimited("%s(), Unable to allocate name!\n",
+                                    __func__);
                kfree(obj);
                return NULL;
        }
@@ -73,8 +73,8 @@ struct ias_object *irias_new_object( char *name, int id)
        obj->attribs = hashbin_new(HB_LOCK);
 
        if (obj->attribs == NULL) {
-               IRDA_WARNING("%s(), Unable to allocate attribs!\n",
-                            __func__);
+               net_warn_ratelimited("%s(), Unable to allocate attribs!\n",
+                                    __func__);
                kfree(obj->name);
                kfree(obj);
                return NULL;
@@ -269,8 +269,8 @@ int irias_object_change_attribute(char *obj_name, char *attrib_name,
        /* Find object */
        obj = hashbin_lock_find(irias_objects, 0, obj_name);
        if (obj == NULL) {
-               IRDA_WARNING("%s: Unable to find object: %s\n", __func__,
-                            obj_name);
+               net_warn_ratelimited("%s: Unable to find object: %s\n",
+                                    __func__, obj_name);
                return -1;
        }
 
@@ -280,8 +280,8 @@ int irias_object_change_attribute(char *obj_name, char *attrib_name,
        /* Find attribute */
        attrib = hashbin_find(obj->attribs, 0, attrib_name);
        if (attrib == NULL) {
-               IRDA_WARNING("%s: Unable to find attribute: %s\n",
-                            __func__, attrib_name);
+               net_warn_ratelimited("%s: Unable to find attribute: %s\n",
+                                    __func__, attrib_name);
                spin_unlock_irqrestore(&obj->attribs->hb_spinlock, flags);
                return -1;
        }
@@ -322,8 +322,8 @@ void irias_add_integer_attrib(struct ias_object *obj, char *name, int value,
 
        attrib = kzalloc(sizeof(struct ias_attrib), GFP_ATOMIC);
        if (attrib == NULL) {
-               IRDA_WARNING("%s: Unable to allocate attribute!\n",
-                            __func__);
+               net_warn_ratelimited("%s: Unable to allocate attribute!\n",
+                                    __func__);
                return;
        }
 
@@ -333,8 +333,8 @@ void irias_add_integer_attrib(struct ias_object *obj, char *name, int value,
        /* Insert value */
        attrib->value = irias_new_integer_value(value);
        if (!attrib->name || !attrib->value) {
-               IRDA_WARNING("%s: Unable to allocate attribute!\n",
-                            __func__);
+               net_warn_ratelimited("%s: Unable to allocate attribute!\n",
+                                    __func__);
                if (attrib->value)
                        irias_delete_value(attrib->value);
                kfree(attrib->name);
@@ -366,8 +366,8 @@ void irias_add_octseq_attrib(struct ias_object *obj, char *name, __u8 *octets,
 
        attrib = kzalloc(sizeof(struct ias_attrib), GFP_ATOMIC);
        if (attrib == NULL) {
-               IRDA_WARNING("%s: Unable to allocate attribute!\n",
-                            __func__);
+               net_warn_ratelimited("%s: Unable to allocate attribute!\n",
+                                    __func__);
                return;
        }
 
@@ -376,8 +376,8 @@ void irias_add_octseq_attrib(struct ias_object *obj, char *name, __u8 *octets,
 
        attrib->value = irias_new_octseq_value( octets, len);
        if (!attrib->name || !attrib->value) {
-               IRDA_WARNING("%s: Unable to allocate attribute!\n",
-                            __func__);
+               net_warn_ratelimited("%s: Unable to allocate attribute!\n",
+                                    __func__);
                if (attrib->value)
                        irias_delete_value(attrib->value);
                kfree(attrib->name);
@@ -408,8 +408,8 @@ void irias_add_string_attrib(struct ias_object *obj, char *name, char *value,
 
        attrib = kzalloc(sizeof( struct ias_attrib), GFP_ATOMIC);
        if (attrib == NULL) {
-               IRDA_WARNING("%s: Unable to allocate attribute!\n",
-                            __func__);
+               net_warn_ratelimited("%s: Unable to allocate attribute!\n",
+                                    __func__);
                return;
        }
 
@@ -418,8 +418,8 @@ void irias_add_string_attrib(struct ias_object *obj, char *name, char *value,
 
        attrib->value = irias_new_string_value(value);
        if (!attrib->name || !attrib->value) {
-               IRDA_WARNING("%s: Unable to allocate attribute!\n",
-                            __func__);
+               net_warn_ratelimited("%s: Unable to allocate attribute!\n",
+                                    __func__);
                if (attrib->value)
                        irias_delete_value(attrib->value);
                kfree(attrib->name);
@@ -442,10 +442,8 @@ struct ias_value *irias_new_integer_value(int integer)
        struct ias_value *value;
 
        value = kzalloc(sizeof(struct ias_value), GFP_ATOMIC);
-       if (value == NULL) {
-               IRDA_WARNING("%s: Unable to kmalloc!\n", __func__);
+       if (value == NULL)
                return NULL;
-       }
 
        value->type = IAS_INTEGER;
        value->len = 4;
@@ -467,16 +465,14 @@ struct ias_value *irias_new_string_value(char *string)
        struct ias_value *value;
 
        value = kzalloc(sizeof(struct ias_value), GFP_ATOMIC);
-       if (value == NULL) {
-               IRDA_WARNING("%s: Unable to kmalloc!\n", __func__);
+       if (value == NULL)
                return NULL;
-       }
 
        value->type = IAS_STRING;
        value->charset = CS_ASCII;
        value->t.string = kstrndup(string, IAS_MAX_STRING, GFP_ATOMIC);
        if (!value->t.string) {
-               IRDA_WARNING("%s: Unable to kmalloc!\n", __func__);
+               net_warn_ratelimited("%s: Unable to kmalloc!\n", __func__);
                kfree(value);
                return NULL;
        }
@@ -498,10 +494,8 @@ struct ias_value *irias_new_octseq_value(__u8 *octseq , int len)
        struct ias_value *value;
 
        value = kzalloc(sizeof(struct ias_value), GFP_ATOMIC);
-       if (value == NULL) {
-               IRDA_WARNING("%s: Unable to kmalloc!\n", __func__);
+       if (value == NULL)
                return NULL;
-       }
 
        value->type = IAS_OCT_SEQ;
        /* Check length */
@@ -511,7 +505,7 @@ struct ias_value *irias_new_octseq_value(__u8 *octseq , int len)
 
        value->t.oct_seq = kmemdup(octseq, len, GFP_ATOMIC);
        if (value->t.oct_seq == NULL){
-               IRDA_WARNING("%s: Unable to kmalloc!\n", __func__);
+               net_warn_ratelimited("%s: Unable to kmalloc!\n", __func__);
                kfree(value);
                return NULL;
        }
@@ -523,10 +517,8 @@ struct ias_value *irias_new_missing_value(void)
        struct ias_value *value;
 
        value = kzalloc(sizeof(struct ias_value), GFP_ATOMIC);
-       if (value == NULL) {
-               IRDA_WARNING("%s: Unable to kmalloc!\n", __func__);
+       if (value == NULL)
                return NULL;
-       }
 
        value->type = IAS_MISSING;