aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-01-06 01:31:00 -0500
committerLen Brown <len.brown@intel.com>2006-01-07 05:05:31 -0500
commitd758a8fa8ce0566947677f7e70bf70c57ad9445c (patch)
treed569ee91b84d237de83b28d6a33270fc695e1f34
parentadd5b5ee992e40c9cd8697ea94c223628be162a7 (diff)
[ACPI] fix kernel-doc warnings in acpi/scan.c
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--Documentation/DocBook/kernel-api.tmpl1
-rw-r--r--drivers/acpi/scan.c27
2 files changed, 18 insertions, 10 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 767433bdbc40..3c47a3f0dc55 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -369,6 +369,7 @@ X!Edrivers/acpi/motherboard.c
369X!Edrivers/acpi/bus.c 369X!Edrivers/acpi/bus.c
370--> 370-->
371!Edrivers/acpi/scan.c 371!Edrivers/acpi/scan.c
372!Idrivers/acpi/scan.c
372<!-- No correct structured comments 373<!-- No correct structured comments
373X!Edrivers/acpi/pci_bind.c 374X!Edrivers/acpi/pci_bind.c
374--> 375-->
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 0745d20afb8c..3b26a7104363 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -475,8 +475,10 @@ static LIST_HEAD(acpi_bus_drivers);
475static DECLARE_MUTEX(acpi_bus_drivers_lock); 475static DECLARE_MUTEX(acpi_bus_drivers_lock);
476 476
477/** 477/**
478 * acpi_bus_match 478 * acpi_bus_match - match device IDs to driver's supported IDs
479 * -------------- 479 * @device: the device that we are trying to match to a driver
480 * @driver: driver whose device id table is being checked
481 *
480 * Checks the device's hardware (_HID) or compatible (_CID) ids to see if it 482 * Checks the device's hardware (_HID) or compatible (_CID) ids to see if it
481 * matches the specified driver's criteria. 483 * matches the specified driver's criteria.
482 */ 484 */
@@ -489,8 +491,10 @@ acpi_bus_match(struct acpi_device *device, struct acpi_driver *driver)
489} 491}
490 492
491/** 493/**
492 * acpi_bus_driver_init 494 * acpi_bus_driver_init - add a device to a driver
493 * -------------------- 495 * @device: the device to add and initialize
496 * @driver: driver for the device
497 *
494 * Used to initialize a device via its device driver. Called whenever a 498 * Used to initialize a device via its device driver. Called whenever a
495 * driver is bound to a device. Invokes the driver's add() and start() ops. 499 * driver is bound to a device. Invokes the driver's add() and start() ops.
496 */ 500 */
@@ -603,8 +607,9 @@ static int acpi_driver_detach(struct acpi_driver *drv)
603} 607}
604 608
605/** 609/**
606 * acpi_bus_register_driver 610 * acpi_bus_register_driver - register a driver with the ACPI bus
607 * ------------------------ 611 * @driver: driver being registered
612 *
608 * Registers a driver with the ACPI bus. Searches the namespace for all 613 * Registers a driver with the ACPI bus. Searches the namespace for all
609 * devices that match the driver's criteria and binds. Returns the 614 * devices that match the driver's criteria and binds. Returns the
610 * number of devices that were claimed by the driver, or a negative 615 * number of devices that were claimed by the driver, or a negative
@@ -633,8 +638,9 @@ int acpi_bus_register_driver(struct acpi_driver *driver)
633EXPORT_SYMBOL(acpi_bus_register_driver); 638EXPORT_SYMBOL(acpi_bus_register_driver);
634 639
635/** 640/**
636 * acpi_bus_unregister_driver 641 * acpi_bus_unregister_driver - unregisters a driver with the APIC bus
637 * -------------------------- 642 * @driver: driver to unregister
643 *
638 * Unregisters a driver with the ACPI bus. Searches the namespace for all 644 * Unregisters a driver with the ACPI bus. Searches the namespace for all
639 * devices that match the driver's criteria and unbinds. 645 * devices that match the driver's criteria and unbinds.
640 */ 646 */
@@ -660,8 +666,9 @@ int acpi_bus_unregister_driver(struct acpi_driver *driver)
660EXPORT_SYMBOL(acpi_bus_unregister_driver); 666EXPORT_SYMBOL(acpi_bus_unregister_driver);
661 667
662/** 668/**
663 * acpi_bus_find_driver 669 * acpi_bus_find_driver - check if there is a driver installed for the device
664 * -------------------- 670 * @device: device that we are trying to find a supporting driver for
671 *
665 * Parses the list of registered drivers looking for a driver applicable for 672 * Parses the list of registered drivers looking for a driver applicable for
666 * the specified device. 673 * the specified device.
667 */ 674 */