diff options
author | Vitaliy Ivanov <vitalivanov@gmail.com> | 2011-06-27 12:07:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 19:06:19 -0400 |
commit | 4d258b25d947521c8b913154db61ec55198243f8 (patch) | |
tree | 4f74f744797e92a0555705dc121ac8aaa041e750 | |
parent | a64227b0855c42b5c037011afa80580ca3228527 (diff) |
Fix some kernel-doc warnings
Fix 'make htmldocs' warnings:
Warning(/include/linux/hrtimer.h:153): No description found for parameter 'clockid'
Warning(/include/linux/device.h:604): Excess struct/union/enum/typedef member 'of_match' description in 'device'
Warning(/include/net/sock.h:349): Excess struct/union/enum/typedef member 'sk_rmem_alloc' description in 'sock'
Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/device.h | 1 | ||||
-rw-r--r-- | include/linux/hrtimer.h | 1 | ||||
-rw-r--r-- | include/net/sock.h | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 553fd37b173b..e4f62d8896b7 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -530,7 +530,6 @@ struct device_dma_parameters { | |||
530 | * @dma_mem: Internal for coherent mem override. | 530 | * @dma_mem: Internal for coherent mem override. |
531 | * @archdata: For arch-specific additions. | 531 | * @archdata: For arch-specific additions. |
532 | * @of_node: Associated device tree node. | 532 | * @of_node: Associated device tree node. |
533 | * @of_match: Matching of_device_id from driver. | ||
534 | * @devt: For creating the sysfs "dev". | 533 | * @devt: For creating the sysfs "dev". |
535 | * @devres_lock: Spinlock to protect the resource of the device. | 534 | * @devres_lock: Spinlock to protect the resource of the device. |
536 | * @devres_head: The resources list of the device. | 535 | * @devres_head: The resources list of the device. |
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 51932e5acf7c..fd0dc30c9f15 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -135,6 +135,7 @@ struct hrtimer_sleeper { | |||
135 | * @cpu_base: per cpu clock base | 135 | * @cpu_base: per cpu clock base |
136 | * @index: clock type index for per_cpu support when moving a | 136 | * @index: clock type index for per_cpu support when moving a |
137 | * timer to a base on another cpu. | 137 | * timer to a base on another cpu. |
138 | * @clockid: clock id for per_cpu support | ||
138 | * @active: red black tree root node for the active timers | 139 | * @active: red black tree root node for the active timers |
139 | * @resolution: the resolution of the clock, in nanoseconds | 140 | * @resolution: the resolution of the clock, in nanoseconds |
140 | * @get_time: function to retrieve the current time of the clock | 141 | * @get_time: function to retrieve the current time of the clock |
diff --git a/include/net/sock.h b/include/net/sock.h index f2046e404a61..c0b938cb4b1a 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -178,7 +178,6 @@ struct sock_common { | |||
178 | * @sk_dst_cache: destination cache | 178 | * @sk_dst_cache: destination cache |
179 | * @sk_dst_lock: destination cache lock | 179 | * @sk_dst_lock: destination cache lock |
180 | * @sk_policy: flow policy | 180 | * @sk_policy: flow policy |
181 | * @sk_rmem_alloc: receive queue bytes committed | ||
182 | * @sk_receive_queue: incoming packets | 181 | * @sk_receive_queue: incoming packets |
183 | * @sk_wmem_alloc: transmit queue bytes committed | 182 | * @sk_wmem_alloc: transmit queue bytes committed |
184 | * @sk_write_queue: Packet sending queue | 183 | * @sk_write_queue: Packet sending queue |