Skip to content

Commit 6d37f7e

Browse files
committed
Merge tag 'acpi-6.9-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki: "These update ACPI documentation and kerneldoc comments. Specifics: - Add markup to generate links from footnotes in the ACPI enumeration document (Chris Packham) - Update the handle_eject_request() kerneldoc comment to document the arguments of the function and improve kerneldoc comments for ACPI suspend and hibernation functions (Yang Li)" * tag 'acpi-6.9-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: PM: Improve kerneldoc comments for suspend and hibernation functions ACPI: docs: enumeration: Make footnotes links ACPI: Document handle_eject_request() arguments
2 parents ed302ad + a873add commit 6d37f7e

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

Documentation/firmware-guide/acpi/enumeration.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ bridges/switches of the board.
595595

596596
For example, let's assume we have a system with a PCIe serial port, an
597597
Exar XR17V3521, soldered on the main board. This UART chip also includes
598-
16 GPIOs and we want to add the property ``gpio-line-names`` [1] to these pins.
598+
16 GPIOs and we want to add the property ``gpio-line-names`` [1]_ to these pins.
599599
In this case, the ``lspci`` output for this component is::
600600

601601
07:00.0 Serial controller: Exar Corp. XR17V3521 Dual PCIe UART (rev 03)
@@ -637,7 +637,7 @@ of the chipset bridge (also called "root port") with address::
637637
Bus: 0 - Device: 14 - Function: 1
638638

639639
To find this information, it is necessary to disassemble the BIOS ACPI tables,
640-
in particular the DSDT (see also [2])::
640+
in particular the DSDT (see also [2]_)::
641641

642642
mkdir ~/tables/
643643
cd ~/tables/
@@ -667,7 +667,7 @@ device::
667667
}
668668
... other definitions follow ...
669669

670-
and the _ADR method [3] returns exactly the device/function couple that
670+
and the _ADR method [3]_ returns exactly the device/function couple that
671671
we are looking for. With this information and analyzing the above ``lspci``
672672
output (both the devices list and the devices tree), we can write the following
673673
ACPI description for the Exar PCIe UART, also adding the list of its GPIO line
@@ -724,10 +724,10 @@ created analyzing the position of the Exar UART in the PCI bus topology.
724724
References
725725
==========
726726

727-
[1] Documentation/firmware-guide/acpi/gpio-properties.rst
727+
.. [1] Documentation/firmware-guide/acpi/gpio-properties.rst
728728
729-
[2] Documentation/admin-guide/acpi/initrd_table_override.rst
729+
.. [2] Documentation/admin-guide/acpi/initrd_table_override.rst
730730
731-
[3] ACPI Specifications, Version 6.3 - Paragraph 6.1.1 _ADR Address)
731+
.. [3] ACPI Specifications, Version 6.3 - Paragraph 6.1.1 _ADR Address)
732732
https://uefi.org/sites/default/files/resources/ACPI_6_3_May16.pdf,
733733
referenced 2020-11-18

drivers/acpi/dock.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,8 @@ static int dock_in_progress(struct dock_station *ds)
380380

381381
/**
382382
* handle_eject_request - handle an undock request checking for error conditions
383+
* @ds: The dock station to undock.
384+
* @event: The ACPI event number associated with the undock request.
383385
*
384386
* Check to make sure the dock device is still present, then undock and
385387
* hotremove all the devices that may need removing.

drivers/acpi/sleep.c

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ static void acpi_pm_finish(void)
502502

503503
/**
504504
* acpi_pm_start - Start system PM transition.
505+
* @acpi_state: The target ACPI power state to transition to.
505506
*/
506507
static void acpi_pm_start(u32 acpi_state)
507508
{
@@ -540,8 +541,9 @@ static u32 acpi_suspend_states[] = {
540541
};
541542

542543
/**
543-
* acpi_suspend_begin - Set the target system sleep state to the state
544-
* associated with given @pm_state, if supported.
544+
* acpi_suspend_begin - Set the target system sleep state to the state
545+
* associated with given @pm_state, if supported.
546+
* @pm_state: The target system power management state.
545547
*/
546548
static int acpi_suspend_begin(suspend_state_t pm_state)
547549
{
@@ -671,10 +673,11 @@ static const struct platform_suspend_ops acpi_suspend_ops = {
671673
};
672674

673675
/**
674-
* acpi_suspend_begin_old - Set the target system sleep state to the
675-
* state associated with given @pm_state, if supported, and
676-
* execute the _PTS control method. This function is used if the
677-
* pre-ACPI 2.0 suspend ordering has been requested.
676+
* acpi_suspend_begin_old - Set the target system sleep state to the
677+
* state associated with given @pm_state, if supported, and
678+
* execute the _PTS control method. This function is used if the
679+
* pre-ACPI 2.0 suspend ordering has been requested.
680+
* @pm_state: The target suspend state for the system.
678681
*/
679682
static int acpi_suspend_begin_old(suspend_state_t pm_state)
680683
{
@@ -967,10 +970,11 @@ static const struct platform_hibernation_ops acpi_hibernation_ops = {
967970
};
968971

969972
/**
970-
* acpi_hibernation_begin_old - Set the target system sleep state to
971-
* ACPI_STATE_S4 and execute the _PTS control method. This
972-
* function is used if the pre-ACPI 2.0 suspend ordering has been
973-
* requested.
973+
* acpi_hibernation_begin_old - Set the target system sleep state to
974+
* ACPI_STATE_S4 and execute the _PTS control method. This
975+
* function is used if the pre-ACPI 2.0 suspend ordering has been
976+
* requested.
977+
* @stage: The power management event message.
974978
*/
975979
static int acpi_hibernation_begin_old(pm_message_t stage)
976980
{

0 commit comments

Comments
 (0)