pcmcia: deprecate CS_OUT_OF_RESOURCE

CS_OUT_OF_RESOURCE was almost only used to note -ENOMEM situations.
Therefore, use -ENOMEM explicitely, and also print out warnings.

CC: netdev@vger.kernel.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 19 insertions, 13 deletions

diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 9d04fb214ec2..0e4141bac7b1 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -122,19 +122,22 @@ static void free_region(struct resource *res)
 
 static int add_interval(struct resource_map *map, u_long base, u_long num)
 {
-    struct resource_map *p, *q;
+        struct resource_map *p, *q;
 
-    for (p = map; ; p = p->next) {
-        if ((p != map) && (p->base+p->num-1 >= base))
-            return -1;
-        if ((p->next == map) || (p->next->base > base+num-1))
-            break;
-    }
-    q = kmalloc(sizeof(struct resource_map), GFP_KERNEL);
-    if (!q) return CS_OUT_OF_RESOURCE;
-    q->base = base; q->num = num;
-    q->next = p->next; p->next = q;
-    return 0;
+        for (p = map; ; p = p->next) {
+                if ((p != map) && (p->base+p->num-1 >= base))
+                        return -1;
+                if ((p->next == map) || (p->next->base > base+num-1))
+                        break;
+        }
+        q = kmalloc(sizeof(struct resource_map), GFP_KERNEL);
+        if (!q) {
+                printk(KERN_WARNING "out of memory to update resources\n");
+                return -ENOMEM;
+        }
+        q->base = base; q->num = num;
+        q->next = p->next; p->next = q;
+        return 0;
 }
 
 /*====================================================================*/
@@ -166,7 +169,10 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num)
             } else {
                 /* Split the block into two pieces */
                 p = kmalloc(sizeof(struct resource_map), GFP_KERNEL);
-                if (!p) return CS_OUT_OF_RESOURCE;
+                if (!p) {
+                    printk(KERN_WARNING "out of memory to update resources\n");
+                    return -ENOMEM;
+                }
                 p->base = base+num;
                 p->num = q->base+q->num - p->base;
                 q->num = base - q->base;