summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaliy Ivanov <vitalivanov@gmail.com>2011-06-27 19:07:08 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-27 16:06:19 -0700
commit4d258b25d947521c8b913154db61ec55198243f8 (patch)
tree4f74f744797e92a0555705dc121ac8aaa041e750
parenta64227b0855c42b5c037011afa80580ca3228527 (diff)
downloadblackbird-op-linux-4d258b25d947521c8b913154db61ec55198243f8.tar.gz
blackbird-op-linux-4d258b25d947521c8b913154db61ec55198243f8.zip
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.h1
-rw-r--r--include/linux/hrtimer.h1
-rw-r--r--include/net/sock.h1
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 {
* @dma_mem: Internal for coherent mem override.
* @archdata: For arch-specific additions.
* @of_node: Associated device tree node.
- * @of_match: Matching of_device_id from driver.
* @devt: For creating the sysfs "dev".
* @devres_lock: Spinlock to protect the resource of the device.
* @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 {
* @cpu_base: per cpu clock base
* @index: clock type index for per_cpu support when moving a
* timer to a base on another cpu.
+ * @clockid: clock id for per_cpu support
* @active: red black tree root node for the active timers
* @resolution: the resolution of the clock, in nanoseconds
* @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 {
* @sk_dst_cache: destination cache
* @sk_dst_lock: destination cache lock
* @sk_policy: flow policy
- * @sk_rmem_alloc: receive queue bytes committed
* @sk_receive_queue: incoming packets
* @sk_wmem_alloc: transmit queue bytes committed
* @sk_write_queue: Packet sending queue
OpenPOWER on IntegriCloud