diff options
Diffstat (limited to 'drivers/rapidio')
-rw-r--r-- | drivers/rapidio/rio-scan.c | 2 | ||||
-rw-r--r-- | drivers/rapidio/rio.c | 10 |
2 files changed, 7 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 | */ |
390 | u32 | 393 | u32 |
391 | rio_mport_get_physefb(struct rio_mport *port, int local, | 394 | rio_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) |