aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-04-21 19:48:26 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-04-21 19:48:26 -0400
commitebc37b611616ad46dce7d590b15ad655aa50213a (patch)
treee2fe9f2dcc4150555b0f42bc898d5e561bff7356 /net
parent29c4be51e3fd52205d848248d38924941f22ca0e (diff)
[ATM]: net/atm/resources.c: remove __free_atm_dev
Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/atm/resources.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/net/atm/resources.c b/net/atm/resources.c
index 33f1685dbb7..a57a9268bd2 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -44,11 +44,6 @@ static struct atm_dev *__alloc_atm_dev(const char *type)
44 return dev; 44 return dev;
45} 45}
46 46
47static void __free_atm_dev(struct atm_dev *dev)
48{
49 kfree(dev);
50}
51
52static struct atm_dev *__atm_dev_lookup(int number) 47static struct atm_dev *__atm_dev_lookup(int number)
53{ 48{
54 struct atm_dev *dev; 49 struct atm_dev *dev;
@@ -90,7 +85,7 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
90 if ((inuse = __atm_dev_lookup(number))) { 85 if ((inuse = __atm_dev_lookup(number))) {
91 atm_dev_put(inuse); 86 atm_dev_put(inuse);
92 spin_unlock(&atm_dev_lock); 87 spin_unlock(&atm_dev_lock);
93 __free_atm_dev(dev); 88 kfree(dev);
94 return NULL; 89 return NULL;
95 } 90 }
96 dev->number = number; 91 dev->number = number;
@@ -119,7 +114,7 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
119 spin_lock(&atm_dev_lock); 114 spin_lock(&atm_dev_lock);
120 list_del(&dev->dev_list); 115 list_del(&dev->dev_list);
121 spin_unlock(&atm_dev_lock); 116 spin_unlock(&atm_dev_lock);
122 __free_atm_dev(dev); 117 kfree(dev);
123 return NULL; 118 return NULL;
124 } 119 }
125 120
@@ -148,7 +143,7 @@ void atm_dev_deregister(struct atm_dev *dev)
148 } 143 }
149 } 144 }
150 145
151 __free_atm_dev(dev); 146 kfree(dev);
152} 147}
153 148
154void shutdown_atm_dev(struct atm_dev *dev) 149void shutdown_atm_dev(struct atm_dev *dev)