aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-05-02 10:59:59 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-21 15:40:48 -0400
commit1740757e8f94c6899705eb6f5434de9404992778 (patch)
tree012bf37dae6c7705a50f88bbdd8d28d975a5dc46
parenta0245f7ad5214cb00131d7cd176446e067c913dc (diff)
[PATCH] Driver Core: remove unused exports
Cc: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/base/attribute_container.c8
-rw-r--r--drivers/base/base.h2
-rw-r--r--drivers/base/bus.c6
-rw-r--r--drivers/base/class.c6
-rw-r--r--include/linux/device.h8
5 files changed, 4 insertions, 26 deletions
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 2a7d7ae83e1e..22220733f76f 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -236,7 +236,6 @@ attribute_container_remove_device(struct device *dev,
236 } 236 }
237 up(&attribute_container_mutex); 237 up(&attribute_container_mutex);
238} 238}
239EXPORT_SYMBOL_GPL(attribute_container_remove_device);
240 239
241/** 240/**
242 * attribute_container_device_trigger - execute a trigger for each matching classdev 241 * attribute_container_device_trigger - execute a trigger for each matching classdev
@@ -276,7 +275,6 @@ attribute_container_device_trigger(struct device *dev,
276 } 275 }
277 up(&attribute_container_mutex); 276 up(&attribute_container_mutex);
278} 277}
279EXPORT_SYMBOL_GPL(attribute_container_device_trigger);
280 278
281/** 279/**
282 * attribute_container_trigger - trigger a function for each matching container 280 * attribute_container_trigger - trigger a function for each matching container
@@ -304,7 +302,6 @@ attribute_container_trigger(struct device *dev,
304 } 302 }
305 up(&attribute_container_mutex); 303 up(&attribute_container_mutex);
306} 304}
307EXPORT_SYMBOL_GPL(attribute_container_trigger);
308 305
309/** 306/**
310 * attribute_container_add_attrs - add attributes 307 * attribute_container_add_attrs - add attributes
@@ -333,7 +330,6 @@ attribute_container_add_attrs(struct class_device *classdev)
333 330
334 return 0; 331 return 0;
335} 332}
336EXPORT_SYMBOL_GPL(attribute_container_add_attrs);
337 333
338/** 334/**
339 * attribute_container_add_class_device - same function as class_device_add 335 * attribute_container_add_class_device - same function as class_device_add
@@ -352,7 +348,6 @@ attribute_container_add_class_device(struct class_device *classdev)
352 return error; 348 return error;
353 return attribute_container_add_attrs(classdev); 349 return attribute_container_add_attrs(classdev);
354} 350}
355EXPORT_SYMBOL_GPL(attribute_container_add_class_device);
356 351
357/** 352/**
358 * attribute_container_add_class_device_adapter - simple adapter for triggers 353 * attribute_container_add_class_device_adapter - simple adapter for triggers
@@ -367,7 +362,6 @@ attribute_container_add_class_device_adapter(struct attribute_container *cont,
367{ 362{
368 return attribute_container_add_class_device(classdev); 363 return attribute_container_add_class_device(classdev);
369} 364}
370EXPORT_SYMBOL_GPL(attribute_container_add_class_device_adapter);
371 365
372/** 366/**
373 * attribute_container_remove_attrs - remove any attribute files 367 * attribute_container_remove_attrs - remove any attribute files
@@ -389,7 +383,6 @@ attribute_container_remove_attrs(struct class_device *classdev)
389 for (i = 0; attrs[i]; i++) 383 for (i = 0; attrs[i]; i++)
390 class_device_remove_file(classdev, attrs[i]); 384 class_device_remove_file(classdev, attrs[i]);
391} 385}
392EXPORT_SYMBOL_GPL(attribute_container_remove_attrs);
393 386
394/** 387/**
395 * attribute_container_class_device_del - equivalent of class_device_del 388 * attribute_container_class_device_del - equivalent of class_device_del
@@ -405,7 +398,6 @@ attribute_container_class_device_del(struct class_device *classdev)
405 attribute_container_remove_attrs(classdev); 398 attribute_container_remove_attrs(classdev);
406 class_device_del(classdev); 399 class_device_del(classdev);
407} 400}
408EXPORT_SYMBOL_GPL(attribute_container_class_device_del);
409 401
410/** 402/**
411 * attribute_container_find_class_device - find the corresponding class_device 403 * attribute_container_find_class_device - find the corresponding class_device
diff --git a/drivers/base/base.h b/drivers/base/base.h
index bbbc2acd921c..122498aef50b 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -13,6 +13,8 @@ extern int attribute_container_init(void);
13extern int bus_add_device(struct device * dev); 13extern int bus_add_device(struct device * dev);
14extern void bus_attach_device(struct device * dev); 14extern void bus_attach_device(struct device * dev);
15extern void bus_remove_device(struct device * dev); 15extern void bus_remove_device(struct device * dev);
16extern struct bus_type *get_bus(struct bus_type * bus);
17extern void put_bus(struct bus_type * bus);
16 18
17extern int bus_add_driver(struct device_driver *); 19extern int bus_add_driver(struct device_driver *);
18extern void bus_remove_driver(struct device_driver *); 20extern void bus_remove_driver(struct device_driver *);
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index b27a6067e5a4..64ba9011d1a8 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -745,15 +745,9 @@ EXPORT_SYMBOL_GPL(bus_for_each_dev);
745EXPORT_SYMBOL_GPL(bus_find_device); 745EXPORT_SYMBOL_GPL(bus_find_device);
746EXPORT_SYMBOL_GPL(bus_for_each_drv); 746EXPORT_SYMBOL_GPL(bus_for_each_drv);
747 747
748EXPORT_SYMBOL_GPL(bus_add_device);
749EXPORT_SYMBOL_GPL(bus_attach_device);
750EXPORT_SYMBOL_GPL(bus_remove_device);
751EXPORT_SYMBOL_GPL(bus_register); 748EXPORT_SYMBOL_GPL(bus_register);
752EXPORT_SYMBOL_GPL(bus_unregister); 749EXPORT_SYMBOL_GPL(bus_unregister);
753EXPORT_SYMBOL_GPL(bus_rescan_devices); 750EXPORT_SYMBOL_GPL(bus_rescan_devices);
754EXPORT_SYMBOL_GPL(get_bus);
755EXPORT_SYMBOL_GPL(put_bus);
756EXPORT_SYMBOL_GPL(find_bus);
757 751
758EXPORT_SYMBOL_GPL(bus_create_file); 752EXPORT_SYMBOL_GPL(bus_create_file);
759EXPORT_SYMBOL_GPL(bus_remove_file); 753EXPORT_SYMBOL_GPL(bus_remove_file);
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 48ad5df72812..4b598be0e4b6 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -91,14 +91,14 @@ void class_remove_file(struct class * cls, const struct class_attribute * attr)
91 sysfs_remove_file(&cls->subsys.kset.kobj, &attr->attr); 91 sysfs_remove_file(&cls->subsys.kset.kobj, &attr->attr);
92} 92}
93 93
94struct class * class_get(struct class * cls) 94static struct class *class_get(struct class *cls)
95{ 95{
96 if (cls) 96 if (cls)
97 return container_of(subsys_get(&cls->subsys), struct class, subsys); 97 return container_of(subsys_get(&cls->subsys), struct class, subsys);
98 return NULL; 98 return NULL;
99} 99}
100 100
101void class_put(struct class * cls) 101static void class_put(struct class * cls)
102{ 102{
103 if (cls) 103 if (cls)
104 subsys_put(&cls->subsys); 104 subsys_put(&cls->subsys);
@@ -894,8 +894,6 @@ EXPORT_SYMBOL_GPL(class_create_file);
894EXPORT_SYMBOL_GPL(class_remove_file); 894EXPORT_SYMBOL_GPL(class_remove_file);
895EXPORT_SYMBOL_GPL(class_register); 895EXPORT_SYMBOL_GPL(class_register);
896EXPORT_SYMBOL_GPL(class_unregister); 896EXPORT_SYMBOL_GPL(class_unregister);
897EXPORT_SYMBOL_GPL(class_get);
898EXPORT_SYMBOL_GPL(class_put);
899EXPORT_SYMBOL_GPL(class_create); 897EXPORT_SYMBOL_GPL(class_create);
900EXPORT_SYMBOL_GPL(class_destroy); 898EXPORT_SYMBOL_GPL(class_destroy);
901 899
diff --git a/include/linux/device.h b/include/linux/device.h
index b2e5da2b637b..ade10dd6b779 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -60,11 +60,6 @@ extern void bus_unregister(struct bus_type * bus);
60 60
61extern void bus_rescan_devices(struct bus_type * bus); 61extern void bus_rescan_devices(struct bus_type * bus);
62 62
63extern struct bus_type * get_bus(struct bus_type * bus);
64extern void put_bus(struct bus_type * bus);
65
66extern struct bus_type * find_bus(char * name);
67
68/* iterator helpers for buses */ 63/* iterator helpers for buses */
69 64
70int bus_for_each_dev(struct bus_type * bus, struct device * start, void * data, 65int bus_for_each_dev(struct bus_type * bus, struct device * start, void * data,
@@ -163,9 +158,6 @@ struct class {
163extern int class_register(struct class *); 158extern int class_register(struct class *);
164extern void class_unregister(struct class *); 159extern void class_unregister(struct class *);
165 160
166extern struct class * class_get(struct class *);
167extern void class_put(struct class *);
168
169 161
170struct class_attribute { 162struct class_attribute {
171 struct attribute attr; 163 struct attribute attr;