| Message ID | 4901589.sjI9o52FIP@aspire.rjw.lan (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
On 13 October 2017 at 15:25, Rafael J. Wysocki <rjw@rjwysocki.net> wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Fix the kerneldoc comments of __device_suspend_noirq(), > __device_suspend_late() and __device_suspend() where the function > names in kerneldoc don't match the actual names of the functions. > > Also fix the device_resume_noirq() kerneldoc comment which mentions > "early resume" instead of "noirq resume" incorrectly. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > drivers/base/power/main.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > Index: linux-pm/drivers/base/power/main.c > =================================================================== > --- linux-pm.orig/drivers/base/power/main.c > +++ linux-pm/drivers/base/power/main.c > @@ -528,7 +528,7 @@ static void dpm_watchdog_clear(struct dp > /*------------------------- Resume routines -------------------------*/ > > /** > - * device_resume_noirq - Execute an "early resume" callback for given device. > + * device_resume_noirq - Execute a "noirq resume" callback for given device. > * @dev: Device to handle. > * @state: PM transition of the system being carried out. > * @async: If true, the device is being resumed asynchronously. > @@ -1077,7 +1077,7 @@ static pm_message_t resume_event(pm_mess > } > > /** > - * device_suspend_noirq - Execute a "late suspend" callback for given device. > + * __device_suspend_noirq - Execute a "noirq suspend" callback for given device. > * @dev: Device to handle. > * @state: PM transition of the system being carried out. > * @async: If true, the device is being suspended asynchronously. > @@ -1237,7 +1237,7 @@ int dpm_suspend_noirq(pm_message_t state > } > > /** > - * device_suspend_late - Execute a "late suspend" callback for given device. > + * __device_suspend_late - Execute a "late suspend" callback for given device. > * @dev: Device to handle. > * @state: PM transition of the system being carried out. > * @async: If true, the device is being suspended asynchronously. > @@ -1439,7 +1439,7 @@ static void dpm_clear_suppliers_direct_c > } > > /** > - * device_suspend - Execute "suspend" callbacks for given device. > + * __device_suspend - Execute "suspend" callbacks for given device. > * @dev: Device to handle. > * @state: PM transition of the system being carried out. > * @async: If true, the device is being suspended asynchronously. >
Index: linux-pm/drivers/base/power/main.c =================================================================== --- linux-pm.orig/drivers/base/power/main.c +++ linux-pm/drivers/base/power/main.c @@ -528,7 +528,7 @@ static void dpm_watchdog_clear(struct dp /*------------------------- Resume routines -------------------------*/ /** - * device_resume_noirq - Execute an "early resume" callback for given device. + * device_resume_noirq - Execute a "noirq resume" callback for given device. * @dev: Device to handle. * @state: PM transition of the system being carried out. * @async: If true, the device is being resumed asynchronously. @@ -1077,7 +1077,7 @@ static pm_message_t resume_event(pm_mess } /** - * device_suspend_noirq - Execute a "late suspend" callback for given device. + * __device_suspend_noirq - Execute a "noirq suspend" callback for given device. * @dev: Device to handle. * @state: PM transition of the system being carried out. * @async: If true, the device is being suspended asynchronously. @@ -1237,7 +1237,7 @@ int dpm_suspend_noirq(pm_message_t state } /** - * device_suspend_late - Execute a "late suspend" callback for given device. + * __device_suspend_late - Execute a "late suspend" callback for given device. * @dev: Device to handle. * @state: PM transition of the system being carried out. * @async: If true, the device is being suspended asynchronously. @@ -1439,7 +1439,7 @@ static void dpm_clear_suppliers_direct_c } /** - * device_suspend - Execute "suspend" callbacks for given device. + * __device_suspend - Execute "suspend" callbacks for given device. * @dev: Device to handle. * @state: PM transition of the system being carried out. * @async: If true, the device is being suspended asynchronously.