aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/base/firmware.c19
-rw-r--r--include/linux/device.h5
2 files changed, 2 insertions, 22 deletions
diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index c7f635b11dfd..9efff481f5dc 100644
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -3,11 +3,11 @@
3 * 3 *
4 * Copyright (c) 2002-3 Patrick Mochel 4 * Copyright (c) 2002-3 Patrick Mochel
5 * Copyright (c) 2002-3 Open Source Development Labs 5 * Copyright (c) 2002-3 Open Source Development Labs
6 * Copyright (c) 2007 Greg Kroah-Hartman <gregkh@suse.de>
7 * Copyright (c) 2007 Novell Inc.
6 * 8 *
7 * This file is released under the GPLv2 9 * This file is released under the GPLv2
8 *
9 */ 10 */
10
11#include <linux/kobject.h> 11#include <linux/kobject.h>
12#include <linux/module.h> 12#include <linux/module.h>
13#include <linux/init.h> 13#include <linux/init.h>
@@ -18,18 +18,6 @@
18struct kset *firmware_kset; 18struct kset *firmware_kset;
19EXPORT_SYMBOL_GPL(firmware_kset); 19EXPORT_SYMBOL_GPL(firmware_kset);
20 20
21int firmware_register(struct kset *s)
22{
23 s->kobj.kset = firmware_kset;
24 s->kobj.ktype = NULL;
25 return subsystem_register(s);
26}
27
28void firmware_unregister(struct kset *s)
29{
30 subsystem_unregister(s);
31}
32
33int __init firmware_init(void) 21int __init firmware_init(void)
34{ 22{
35 firmware_kset = kset_create_and_add("firmware", NULL, NULL); 23 firmware_kset = kset_create_and_add("firmware", NULL, NULL);
@@ -37,6 +25,3 @@ int __init firmware_init(void)
37 return -ENOMEM; 25 return -ENOMEM;
38 return 0; 26 return 0;
39} 27}
40
41EXPORT_SYMBOL_GPL(firmware_register);
42EXPORT_SYMBOL_GPL(firmware_unregister);
diff --git a/include/linux/device.h b/include/linux/device.h
index 110ace0dec3f..a3b3ff15fc87 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -555,11 +555,6 @@ extern void device_shutdown(void);
555/* drivers/base/sys.c */ 555/* drivers/base/sys.c */
556extern void sysdev_shutdown(void); 556extern void sysdev_shutdown(void);
557 557
558
559/* drivers/base/firmware.c */
560extern int __must_check firmware_register(struct kset *);
561extern void firmware_unregister(struct kset *);
562
563/* debugging and troubleshooting/diagnostic helpers. */ 558/* debugging and troubleshooting/diagnostic helpers. */
564extern const char *dev_driver_string(struct device *dev); 559extern const char *dev_driver_string(struct device *dev);
565#define dev_printk(level, dev, format, arg...) \ 560#define dev_printk(level, dev, format, arg...) \