---

yaml --- r: 193639 b: refs/heads/master c: 62c97ac h: refs/heads/master i: 193637: 4eb939f 193635: c0bb5cf 193631: 1f276e2 v: v3
git-mirror · Mar 22, 2010 · a3e1e9b · a3e1e9b
1 parent 7cf253f
commit a3e1e9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 283f2fe87e980d8af5ad8aa63751e7e3258ee05a
+refs/heads/master: 62c97ac04a67c120ec37a9bfd445a8d5dbbc1ed2
diff --git a/trunk/net/atm/proc.c b/trunk/net/atm/proc.c
@@ -406,24 +406,16 @@ EXPORT_SYMBOL(atm_proc_root);
 
 int atm_proc_dev_register(struct atm_dev *dev)
 {
-	int digits, num;
 	int error;
 
 	/* No proc info */
 	if (!dev->ops->proc_read)
 		return 0;
 
 	error = -ENOMEM;
-	digits = 0;
-	for (num = dev->number; num; num /= 10)
-		digits++;
-	if (!digits)
-		digits++;
-
-	dev->proc_name = kmalloc(strlen(dev->type) + digits + 2, GFP_KERNEL);
+	dev->proc_name = kasprintf(GFP_KERNEL, "%s:%d", dev->type, dev->number);
 	if (!dev->proc_name)
 		goto err_out;
-	sprintf(dev->proc_name, "%s:%d", dev->type, dev->number);
 
 	dev->proc_entry = proc_create_data(dev->proc_name, 0, atm_proc_root,
 					   &proc_atm_dev_ops, dev);