From a3e1e9ba1662b59f9f8f124b463993920b31b1bb Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 18 Mar 2010 13:48:26 +0000
Subject: [PATCH] --- yaml --- r: 193639 b: refs/heads/master c:
 62c97ac04a67c120ec37a9bfd445a8d5dbbc1ed2 h: refs/heads/master i:   193637:
 4eb939fdef3fb6bb270f9adec3edc21ec44d74ea   193635:
 c0bb5cfe908ea5ce2bacd253ed856aea93386685   193631:
 1f276e26b83ca071bee4ac3b1d59f2caa2effa14 v: v3

---
 [refs]               |  2 +-
 trunk/net/atm/proc.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 391b3f363be8..da82bfe64948 100644
--- 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
index 7a96b2376bd7..f188a399c679 100644
--- a/trunk/net/atm/proc.c
+++ b/trunk/net/atm/proc.c
@@ -406,7 +406,6 @@ EXPORT_SYMBOL(atm_proc_root);
 
 int atm_proc_dev_register(struct atm_dev *dev)
 {
-	int digits, num;
 	int error;
 
 	/* No proc info */
@@ -414,16 +413,9 @@ int atm_proc_dev_register(struct atm_dev *dev)
 		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);