aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-05-28 18:08:08 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 12:02:47 -0400
commit97ef6f7449da6ceddf9a90fa8851f607b67283dd (patch)
treea994fe080741edc1c6ef0281ec72425f25b3f256
parent06b2e9886e039c2f1b3048c47e539b80ab4155b0 (diff)
rapidio: fix new kernel-doc warnings
Fix a bunch of new rapidio kernel-doc warnings: Warning(include/linux/rio.h:123): No description found for parameter 'comp_tag' Warning(include/linux/rio.h:123): No description found for parameter 'phys_efptr' Warning(include/linux/rio.h:123): No description found for parameter 'em_efptr' Warning(include/linux/rio.h:123): No description found for parameter 'pwcback' Warning(include/linux/rio.h:247): No description found for parameter 'set_domain' Warning(include/linux/rio.h:247): No description found for parameter 'get_domain' Warning(drivers/rapidio/rio-scan.c:1133): No description found for parameter 'rdev' Warning(drivers/rapidio/rio-scan.c:1133): Excess function parameter 'port' description in 'rio_init_em' Warning(drivers/rapidio/rio.c:349): No description found for parameter 'rdev' Warning(drivers/rapidio/rio.c:349): Excess function parameter 'mport' description in 'rio_request_inb_pwrite' Warning(drivers/rapidio/rio.c:393): No description found for parameter 'port' Warning(drivers/rapidio/rio.c:393): No description found for parameter 'local' Warning(drivers/rapidio/rio.c:393): No description found for parameter 'destid' Warning(drivers/rapidio/rio.c:393): No description found for parameter 'hopcount' Warning(drivers/rapidio/rio.c:393): Excess function parameter 'rdev' description in 'rio_mport_get_physefb' Warning(drivers/rapidio/rio.c:845): Excess function parameter 'local' description in 'rio_std_route_clr_table' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Alexandre Bounine <alexandre.bounine@idt.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rapidio/rio-scan.c2
-rw-r--r--drivers/rapidio/rio.c10
-rw-r--r--include/linux/rio.h6
3 files changed, 13 insertions, 5 deletions
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 566432106cc5..8070e074c739 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -1124,7 +1124,7 @@ static void rio_update_route_tables(struct rio_mport *port)
1124 1124
1125/** 1125/**
1126 * rio_init_em - Initializes RIO Error Management (for switches) 1126 * rio_init_em - Initializes RIO Error Management (for switches)
1127 * @port: Master port associated with the RIO network 1127 * @rdev: RIO device
1128 * 1128 *
1129 * For each enumerated switch, call device-specific error management 1129 * For each enumerated switch, call device-specific error management
1130 * initialization routine (if supplied by the switch driver). 1130 * initialization routine (if supplied by the switch driver).
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 777e099a3d8f..08fa453af974 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -338,7 +338,7 @@ int rio_release_outb_dbell(struct rio_dev *rdev, struct resource *res)
338 338
339/** 339/**
340 * rio_request_inb_pwrite - request inbound port-write message service 340 * rio_request_inb_pwrite - request inbound port-write message service
341 * @mport: RIO device to which register inbound port-write callback routine 341 * @rdev: RIO device to which register inbound port-write callback routine
342 * @pwcback: Callback routine to execute when port-write is received 342 * @pwcback: Callback routine to execute when port-write is received
343 * 343 *
344 * Binds a port-write callback function to the RapidIO device. 344 * Binds a port-write callback function to the RapidIO device.
@@ -385,7 +385,10 @@ EXPORT_SYMBOL_GPL(rio_release_inb_pwrite);
385/** 385/**
386 * rio_mport_get_physefb - Helper function that returns register offset 386 * rio_mport_get_physefb - Helper function that returns register offset
387 * for Physical Layer Extended Features Block. 387 * for Physical Layer Extended Features Block.
388 * @rdev: RIO device 388 * @port: Master port to issue transaction
389 * @local: Indicate a local master port or remote device access
390 * @destid: Destination ID of the device
391 * @hopcount: Number of switch hops to the device
389 */ 392 */
390u32 393u32
391rio_mport_get_physefb(struct rio_mport *port, int local, 394rio_mport_get_physefb(struct rio_mport *port, int local,
@@ -430,7 +433,7 @@ rio_mport_get_physefb(struct rio_mport *port, int local,
430 433
431/** 434/**
432 * rio_get_comptag - Begin or continue searching for a RIO device by component tag 435 * rio_get_comptag - Begin or continue searching for a RIO device by component tag
433 * @comp_tag: RIO component tad to match 436 * @comp_tag: RIO component tag to match
434 * @from: Previous RIO device found in search, or %NULL for new search 437 * @from: Previous RIO device found in search, or %NULL for new search
435 * 438 *
436 * Iterates through the list of known RIO devices. If a RIO device is 439 * Iterates through the list of known RIO devices. If a RIO device is
@@ -835,7 +838,6 @@ int rio_std_route_get_entry(struct rio_mport *mport, u16 destid, u8 hopcount,
835 * rio_std_route_clr_table - Clear swotch route table using standard registers 838 * rio_std_route_clr_table - Clear swotch route table using standard registers
836 * defined in RIO specification rev.1.3. 839 * defined in RIO specification rev.1.3.
837 * @mport: Master port to issue transaction 840 * @mport: Master port to issue transaction
838 * @local: Indicate a local master port or remote device access
839 * @destid: Destination ID of the device 841 * @destid: Destination ID of the device
840 * @hopcount: Number of switch hops to the device 842 * @hopcount: Number of switch hops to the device
841 * @table: routing table ID (global or port-specific) 843 * @table: routing table ID (global or port-specific)
diff --git a/include/linux/rio.h b/include/linux/rio.h
index 19b5f227096e..bd6eb0ed34a7 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -88,11 +88,15 @@ union rio_pw_msg;
88 * @swpinfo: Switch port info 88 * @swpinfo: Switch port info
89 * @src_ops: Source operation capabilities 89 * @src_ops: Source operation capabilities
90 * @dst_ops: Destination operation capabilities 90 * @dst_ops: Destination operation capabilities
91 * @comp_tag: RIO component tag
92 * @phys_efptr: RIO device extended features pointer
93 * @em_efptr: RIO Error Management features pointer
91 * @dma_mask: Mask of bits of RIO address this device implements 94 * @dma_mask: Mask of bits of RIO address this device implements
92 * @rswitch: Pointer to &struct rio_switch if valid for this device 95 * @rswitch: Pointer to &struct rio_switch if valid for this device
93 * @driver: Driver claiming this device 96 * @driver: Driver claiming this device
94 * @dev: Device model device 97 * @dev: Device model device
95 * @riores: RIO resources this device owns 98 * @riores: RIO resources this device owns
99 * @pwcback: port-write callback function for this device
96 * @destid: Network destination ID 100 * @destid: Network destination ID
97 */ 101 */
98struct rio_dev { 102struct rio_dev {
@@ -222,6 +226,8 @@ struct rio_net {
222 * @add_entry: Callback for switch-specific route add function 226 * @add_entry: Callback for switch-specific route add function
223 * @get_entry: Callback for switch-specific route get function 227 * @get_entry: Callback for switch-specific route get function
224 * @clr_table: Callback for switch-specific clear route table function 228 * @clr_table: Callback for switch-specific clear route table function
229 * @set_domain: Callback for switch-specific domain setting function
230 * @get_domain: Callback for switch-specific domain get function
225 * @em_init: Callback for switch-specific error management initialization function 231 * @em_init: Callback for switch-specific error management initialization function
226 * @em_handle: Callback for switch-specific error management handler function 232 * @em_handle: Callback for switch-specific error management handler function
227 */ 233 */