diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 13:08:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 13:08:08 -0500 |
commit | a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99 (patch) | |
tree | d92277ec77dbaf6f04a1ab4fe31a974c1ce51f76 /drivers | |
parent | 4f57d865f1d863346ac50db9c25859e73a86499c (diff) | |
parent | b4d20859362fde976bb2fa53eb51b798cdba1afc (diff) |
Merge branch 'kernel-doc' from Randy Dunlap
The usual kernel-doc fixups from Randy. Some of them David acked as
merged in his tree, this is the random left-overs.
* kernel-doc:
docbook: fix sched source file names in device-drivers book
docbook: change iomap source filename in deviceiobook
docbook: don't use serial_core.h in device-drivers book
kernel-doc: fix kernel-doc warnings in sched
kernel-doc: fix new warnings in cfg80211.h
kernel-doc: fix new warning in usb.h
kernel-doc: fix new warnings in device.h
kernel-doc: fix new warnings in debugfs
kernel-doc: fix new warning in regulator core
kernel-doc: fix new warnings in pci
kernel-doc: fix new warnings in driver-core
kernel-doc: fix new warnings in auditsc.c
scripts/kernel-doc: fix fatal error caused by cfg80211.h
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/bus.c | 9 | ||||
-rw-r--r-- | drivers/pci/pci.c | 6 | ||||
-rw-r--r-- | drivers/regulator/core.c | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 99dc5921e1dd..40fb12288ce2 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c | |||
@@ -915,9 +915,10 @@ static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store); | |||
915 | 915 | ||
916 | /** | 916 | /** |
917 | * __bus_register - register a driver-core subsystem | 917 | * __bus_register - register a driver-core subsystem |
918 | * @bus: bus. | 918 | * @bus: bus to register |
919 | * @key: lockdep class key | ||
919 | * | 920 | * |
920 | * Once we have that, we registered the bus with the kobject | 921 | * Once we have that, we register the bus with the kobject |
921 | * infrastructure, then register the children subsystems it has: | 922 | * infrastructure, then register the children subsystems it has: |
922 | * the devices and drivers that belong to the subsystem. | 923 | * the devices and drivers that belong to the subsystem. |
923 | */ | 924 | */ |
@@ -1220,8 +1221,8 @@ static void system_root_device_release(struct device *dev) | |||
1220 | } | 1221 | } |
1221 | /** | 1222 | /** |
1222 | * subsys_system_register - register a subsystem at /sys/devices/system/ | 1223 | * subsys_system_register - register a subsystem at /sys/devices/system/ |
1223 | * @subsys - system subsystem | 1224 | * @subsys: system subsystem |
1224 | * @groups - default attributes for the root device | 1225 | * @groups: default attributes for the root device |
1225 | * | 1226 | * |
1226 | * All 'system' subsystems have a /sys/devices/system/<name> root device | 1227 | * All 'system' subsystems have a /sys/devices/system/<name> root device |
1227 | * with the name of the subsystem. The root device can carry subsystem- | 1228 | * with the name of the subsystem. The root device can carry subsystem- |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 97fff785e97e..af295bb21d62 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -2802,7 +2802,7 @@ pci_intx(struct pci_dev *pdev, int enable) | |||
2802 | 2802 | ||
2803 | /** | 2803 | /** |
2804 | * pci_intx_mask_supported - probe for INTx masking support | 2804 | * pci_intx_mask_supported - probe for INTx masking support |
2805 | * @pdev: the PCI device to operate on | 2805 | * @dev: the PCI device to operate on |
2806 | * | 2806 | * |
2807 | * Check if the device dev support INTx masking via the config space | 2807 | * Check if the device dev support INTx masking via the config space |
2808 | * command word. | 2808 | * command word. |
@@ -2884,7 +2884,7 @@ done: | |||
2884 | 2884 | ||
2885 | /** | 2885 | /** |
2886 | * pci_check_and_mask_intx - mask INTx on pending interrupt | 2886 | * pci_check_and_mask_intx - mask INTx on pending interrupt |
2887 | * @pdev: the PCI device to operate on | 2887 | * @dev: the PCI device to operate on |
2888 | * | 2888 | * |
2889 | * Check if the device dev has its INTx line asserted, mask it and | 2889 | * Check if the device dev has its INTx line asserted, mask it and |
2890 | * return true in that case. False is returned if not interrupt was | 2890 | * return true in that case. False is returned if not interrupt was |
@@ -2898,7 +2898,7 @@ EXPORT_SYMBOL_GPL(pci_check_and_mask_intx); | |||
2898 | 2898 | ||
2899 | /** | 2899 | /** |
2900 | * pci_check_and_mask_intx - unmask INTx of no interrupt is pending | 2900 | * pci_check_and_mask_intx - unmask INTx of no interrupt is pending |
2901 | * @pdev: the PCI device to operate on | 2901 | * @dev: the PCI device to operate on |
2902 | * | 2902 | * |
2903 | * Check if the device dev has its INTx line asserted, unmask it if not | 2903 | * Check if the device dev has its INTx line asserted, unmask it if not |
2904 | * and return true. False is returned and the mask remains active if | 2904 | * and return true. False is returned and the mask remains active if |
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index ca86f39a0fdc..b1fa25d6583a 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -2731,6 +2731,7 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) | |||
2731 | * @dev: struct device for the regulator | 2731 | * @dev: struct device for the regulator |
2732 | * @init_data: platform provided init data, passed through by driver | 2732 | * @init_data: platform provided init data, passed through by driver |
2733 | * @driver_data: private regulator data | 2733 | * @driver_data: private regulator data |
2734 | * @of_node: target open firmware device structure (may be NULL) | ||
2734 | * | 2735 | * |
2735 | * Called by regulator drivers to register a regulator. | 2736 | * Called by regulator drivers to register a regulator. |
2736 | * Returns 0 on success. | 2737 | * Returns 0 on success. |