Received: with ECARTIS (v1.0.0; list netdev); Sun, 10 Apr 2005 08:26:58 -0700 (PDT) Received: from ginger.cmf.nrl.navy.mil (ginger.cmf.nrl.navy.mil [134.207.10.161]) by oss.sgi.com (8.13.0/8.13.0) with ESMTP id j3AFQrMa029269 for ; Sun, 10 Apr 2005 08:26:54 -0700 Received: from cmf.nrl.navy.mil (thirdoffive.cmf.nrl.navy.mil [134.207.10.180]) by ginger.cmf.nrl.navy.mil (8.12.11/8.12.11) with ESMTP id j3AFQlPS007582; Sun, 10 Apr 2005 11:26:47 -0400 (EDT) Message-Id: <200504101526.j3AFQlPS007582@ginger.cmf.nrl.navy.mil> To: netdev@oss.sgi.com Cc: davem@redhat.com Subject: [PATCH 1/3][ATM]: net/atm/resources.c: remove __free_atm_dev Date: Sun, 10 Apr 2005 11:26:48 -0400 From: "chas williams - CONTRACTOR" X-Virus-Scanned: ClamAV 0.83/816/Fri Apr 8 17:46:45 2005 on oss.sgi.com X-Virus-Scanned: NAI Completed X-Scanned-By: MIMEDefang 2.30 (www . roaringpenguin . com / mimedefang) X-Virus-Status: Clean X-archive-position: 1640 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: chas@cmf.nrl.navy.mil Precedence: bulk X-list: netdev Content-Length: 1443 Lines: 60 please apply to 2.6 -- thanks! # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/04/10 10:36:30-04:00 chas@relax.cmf.nrl.navy.mil # [ATM]: net/atm/resources.c: remove __free_atm_dev # # Signed-off-by: Adrian Bunk # Signed-off-by: Chas Williams # # net/atm/resources.c # 2005/04/10 10:36:11-04:00 chas@relax.cmf.nrl.navy.mil +3 -8 # [ATM]: net/atm/resources.c: remove __free_atm_dev # # Signed-off-by: Adrian Bunk # Signed-off-by: Chas Williams # diff -Nru a/net/atm/resources.c b/net/atm/resources.c --- a/net/atm/resources.c 2005-04-10 11:14:12 -04:00 +++ b/net/atm/resources.c 2005-04-10 11:14:12 -04:00 @@ -44,11 +44,6 @@ return dev; } -static void __free_atm_dev(struct atm_dev *dev) -{ - kfree(dev); -} - static struct atm_dev *__atm_dev_lookup(int number) { struct atm_dev *dev; @@ -90,7 +85,7 @@ if ((inuse = __atm_dev_lookup(number))) { atm_dev_put(inuse); spin_unlock(&atm_dev_lock); - __free_atm_dev(dev); + kfree(dev); return NULL; } dev->number = number; @@ -119,7 +114,7 @@ spin_lock(&atm_dev_lock); list_del(&dev->dev_list); spin_unlock(&atm_dev_lock); - __free_atm_dev(dev); + kfree(dev); return NULL; } @@ -148,7 +143,7 @@ } } - __free_atm_dev(dev); + kfree(dev); } void shutdown_atm_dev(struct atm_dev *dev)