aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-30 16:35:35 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-30 16:35:35 -0700
commitaf9473118979f3b09ee5d92fdbd8014cf085f7c5 (patch)
tree922f5623f1861dcf00a33aca5d7f2ae6b7782cb1 /drivers
parent9f8e35fc0c1d96e5383eca5f0c7c963a9fadef57 (diff)
parent74c5b597e9c2fc728c61582afdea4971a5c8ed8f (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: modules: better error messages when modules fail to load due to a sysfs problem. kobject: update documentation kset: kernel-doc cleanups driver core: revert "device" link creation check stable_api_nonsense.txt: Disambiguate the use of "this" by using "that" to refer to the syscall interface Fix Doc/sysfs-rules typos kernel-doc fixes for PCI and drivers/base/ kobject: put kobject_actions in kobject.h kobject: fix link error when CONFIG_HOTPLUG is disabled HOWTO: sync Japanese HOWTO HOWTO: adjust translation header of Japanese stable_api_nonsense.txt
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/core.c5
-rw-r--r--drivers/base/firmware_class.c1
-rw-r--r--drivers/pci/pci.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 3599ab2506d..e6738bcbe5a 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -24,8 +24,6 @@
#include "base.h"
#include "power/power.h"
-extern const char *kobject_actions[];
-
int (*platform_notify)(struct device * dev) = NULL;
int (*platform_notify_remove)(struct device * dev) = NULL;
@@ -680,8 +678,7 @@ static int device_add_class_symlinks(struct device *dev)
if (error)
goto out_subsys;
}
- /* only bus-device parents get a "device"-link */
- if (dev->parent && dev->parent->bus) {
+ if (dev->parent) {
error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
"device");
if (error)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 53f0ee6f301..b24efd4e3e3 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)
/**
* firmware_data_write - write method for firmware
* @kobj: kobject for the device
+ * @bin_attr: bin_attr structure
* @buffer: buffer being written
* @offset: buffer offset for write in total data store area
* @count: buffer size
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index fba319d6fcc..1ee9cd9c86e 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1517,7 +1517,7 @@ EXPORT_SYMBOL(pcie_get_readrq);
/**
* pcie_set_readrq - set PCI Express maximum memory read request
* @dev: PCI device to query
- * @count: maximum memory read count in bytes
+ * @rq: maximum memory read count in bytes
* valid values are 128, 256, 512, 1024, 2048, 4096
*
* If possible sets maximum read byte count