Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branches 'pm-docs' and 'pm-tools'

* pm-docs:
PM: clk: remove kernel-doc warning
PM: wakeup: fix kernel-doc warnings and fix typos
PM: runtime: remove kernel-doc warnings

* pm-tools:
pm-graph: Fix typo "accesible"

+12 -11
+1 -1
drivers/base/power/clock_ops.c
··· 140 140 } 141 141 142 142 /** 143 - * pm_clk_enable - Enable a clock, reporting any errors 143 + * __pm_clk_enable - Enable a clock, reporting any errors 144 144 * @dev: The device for the given clock 145 145 * @ce: PM clock entry corresponding to the clock. 146 146 */
+1 -1
drivers/base/power/runtime.c
··· 951 951 952 952 /** 953 953 * pm_suspend_timer_fn - Timer function for pm_schedule_suspend(). 954 - * @data: Device pointer passed by pm_schedule_suspend(). 954 + * @timer: hrtimer used by pm_schedule_suspend(). 955 955 * 956 956 * Check if the time is right and queue a suspend request. 957 957 */
+9 -8
drivers/base/power/wakeup.c
··· 400 400 } 401 401 402 402 /** 403 - * device_wakeup_arm_wake_irqs(void) 403 + * device_wakeup_arm_wake_irqs - 404 404 * 405 - * Itereates over the list of device wakeirqs to arm them. 405 + * Iterates over the list of device wakeirqs to arm them. 406 406 */ 407 407 void device_wakeup_arm_wake_irqs(void) 408 408 { ··· 416 416 } 417 417 418 418 /** 419 - * device_wakeup_disarm_wake_irqs(void) 419 + * device_wakeup_disarm_wake_irqs - 420 420 * 421 - * Itereates over the list of device wakeirqs to disarm them. 421 + * Iterates over the list of device wakeirqs to disarm them. 422 422 */ 423 423 void device_wakeup_disarm_wake_irqs(void) 424 424 { ··· 532 532 /** 533 533 * device_set_wakeup_enable - Enable or disable a device to wake up the system. 534 534 * @dev: Device to handle. 535 + * @enable: enable/disable flag 535 536 */ 536 537 int device_set_wakeup_enable(struct device *dev, bool enable) 537 538 { ··· 582 581 */ 583 582 584 583 /** 585 - * wakup_source_activate - Mark given wakeup source as active. 584 + * wakeup_source_activate - Mark given wakeup source as active. 586 585 * @ws: Wakeup source to handle. 587 586 * 588 587 * Update the @ws' statistics and, if @ws has just been activated, notify the PM ··· 687 686 #endif 688 687 689 688 /** 690 - * wakup_source_deactivate - Mark given wakeup source as inactive. 689 + * wakeup_source_deactivate - Mark given wakeup source as inactive. 691 690 * @ws: Wakeup source to handle. 692 691 * 693 692 * Update the @ws' statistics and notify the PM core that the wakeup source has ··· 786 785 787 786 /** 788 787 * pm_wakeup_timer_fn - Delayed finalization of a wakeup event. 789 - * @data: Address of the wakeup source object associated with the event source. 788 + * @t: timer list 790 789 * 791 790 * Call wakeup_source_deactivate() for the wakeup source whose address is stored 792 791 * in @data if it is currently active and its timer has not been canceled and ··· 1022 1021 #ifdef CONFIG_PM_AUTOSLEEP 1023 1022 /** 1024 1023 * pm_wakep_autosleep_enabled - Modify autosleep_enabled for all wakeup sources. 1025 - * @enabled: Whether to set or to clear the autosleep_enabled flags. 1024 + * @set: Whether to set or to clear the autosleep_enabled flags. 1026 1025 */ 1027 1026 void pm_wakep_autosleep_enabled(bool set) 1028 1027 {
+1 -1
tools/power/pm-graph/sleepgraph.py
··· 6819 6819 sysvals.outdir = val 6820 6820 sysvals.notestrun = True 6821 6821 if(os.path.isdir(val) == False): 6822 - doError('%s is not accesible' % val) 6822 + doError('%s is not accessible' % val) 6823 6823 elif(arg == '-filter'): 6824 6824 try: 6825 6825 val = next(args)