aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/core.c5
-rw-r--r--drivers/base/firmware_class.c1
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 3599ab2506d2..e6738bcbe5a9 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -24,8 +24,6 @@
24#include "base.h" 24#include "base.h"
25#include "power/power.h" 25#include "power/power.h"
26 26
27extern const char *kobject_actions[];
28
29int (*platform_notify)(struct device * dev) = NULL; 27int (*platform_notify)(struct device * dev) = NULL;
30int (*platform_notify_remove)(struct device * dev) = NULL; 28int (*platform_notify_remove)(struct device * dev) = NULL;
31 29
@@ -680,8 +678,7 @@ static int device_add_class_symlinks(struct device *dev)
680 if (error) 678 if (error)
681 goto out_subsys; 679 goto out_subsys;
682 } 680 }
683 /* only bus-device parents get a "device"-link */ 681 if (dev->parent) {
684 if (dev->parent && dev->parent->bus) {
685 error = sysfs_create_link(&dev->kobj, &dev->parent->kobj, 682 error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
686 "device"); 683 "device");
687 if (error) 684 if (error)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 53f0ee6f3016..b24efd4e3e3d 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -232,6 +232,7 @@ fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
232/** 232/**
233 * firmware_data_write - write method for firmware 233 * firmware_data_write - write method for firmware
234 * @kobj: kobject for the device 234 * @kobj: kobject for the device
235 * @bin_attr: bin_attr structure
235 * @buffer: buffer being written 236 * @buffer: buffer being written
236 * @offset: buffer offset for write in total data store area 237 * @offset: buffer offset for write in total data store area
237 * @count: buffer size 238 * @count: buffer size