aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/runtime.c2
-rw-r--r--drivers/base/sys.c14
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 54597c859ecb..3172c60d23a9 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -443,7 +443,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
443 * 443 *
444 * Check if the device's run-time PM status allows it to be resumed. Cancel 444 * Check if the device's run-time PM status allows it to be resumed. Cancel
445 * any scheduled or pending requests. If another resume has been started 445 * any scheduled or pending requests. If another resume has been started
446 * earlier, either return imediately or wait for it to finish, depending on the 446 * earlier, either return immediately or wait for it to finish, depending on the
447 * RPM_NOWAIT and RPM_ASYNC flags. Similarly, if there's a suspend running in 447 * RPM_NOWAIT and RPM_ASYNC flags. Similarly, if there's a suspend running in
448 * parallel with this function, either tell the other process to resume after 448 * parallel with this function, either tell the other process to resume after
449 * suspending (deferred_resume) or wait for it to finish. If the RPM_ASYNC 449 * suspending (deferred_resume) or wait for it to finish. If the RPM_ASYNC
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index fbe72da6c414..acde9b5ee131 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -197,7 +197,7 @@ kset_put:
197} 197}
198 198
199/** 199/**
200 * sysdev_driver_register - Register auxillary driver 200 * sysdev_driver_register - Register auxiliary driver
201 * @cls: Device class driver belongs to. 201 * @cls: Device class driver belongs to.
202 * @drv: Driver. 202 * @drv: Driver.
203 * 203 *
@@ -250,7 +250,7 @@ unlock:
250} 250}
251 251
252/** 252/**
253 * sysdev_driver_unregister - Remove an auxillary driver. 253 * sysdev_driver_unregister - Remove an auxiliary driver.
254 * @cls: Class driver belongs to. 254 * @cls: Class driver belongs to.
255 * @drv: Driver. 255 * @drv: Driver.
256 */ 256 */
@@ -302,7 +302,7 @@ int sysdev_register(struct sys_device *sysdev)
302 * code that should have called us. 302 * code that should have called us.
303 */ 303 */
304 304
305 /* Notify class auxillary drivers */ 305 /* Notify class auxiliary drivers */
306 list_for_each_entry(drv, &cls->drivers, entry) { 306 list_for_each_entry(drv, &cls->drivers, entry) {
307 if (drv->add) 307 if (drv->add)
308 drv->add(sysdev); 308 drv->add(sysdev);
@@ -335,7 +335,7 @@ void sysdev_unregister(struct sys_device *sysdev)
335 * 335 *
336 * Loop over each class of system devices, and the devices in each 336 * Loop over each class of system devices, and the devices in each
337 * of those classes. For each device, we call the shutdown method for 337 * of those classes. For each device, we call the shutdown method for
338 * each driver registered for the device - the auxillaries, 338 * each driver registered for the device - the auxiliaries,
339 * and the class driver. 339 * and the class driver.
340 * 340 *
341 * Note: The list is iterated in reverse order, so that we shut down 341 * Note: The list is iterated in reverse order, so that we shut down
@@ -360,7 +360,7 @@ void sysdev_shutdown(void)
360 struct sysdev_driver *drv; 360 struct sysdev_driver *drv;
361 pr_debug(" %s\n", kobject_name(&sysdev->kobj)); 361 pr_debug(" %s\n", kobject_name(&sysdev->kobj));
362 362
363 /* Call auxillary drivers first */ 363 /* Call auxiliary drivers first */
364 list_for_each_entry(drv, &cls->drivers, entry) { 364 list_for_each_entry(drv, &cls->drivers, entry) {
365 if (drv->shutdown) 365 if (drv->shutdown)
366 drv->shutdown(sysdev); 366 drv->shutdown(sysdev);
@@ -385,7 +385,7 @@ static void __sysdev_resume(struct sys_device *dev)
385 WARN_ONCE(!irqs_disabled(), 385 WARN_ONCE(!irqs_disabled(),
386 "Interrupts enabled after %pF\n", cls->resume); 386 "Interrupts enabled after %pF\n", cls->resume);
387 387
388 /* Call auxillary drivers next. */ 388 /* Call auxiliary drivers next. */
389 list_for_each_entry(drv, &cls->drivers, entry) { 389 list_for_each_entry(drv, &cls->drivers, entry) {
390 if (drv->resume) 390 if (drv->resume)
391 drv->resume(dev); 391 drv->resume(dev);
@@ -432,7 +432,7 @@ int sysdev_suspend(pm_message_t state)
432 list_for_each_entry(sysdev, &cls->kset.list, kobj.entry) { 432 list_for_each_entry(sysdev, &cls->kset.list, kobj.entry) {
433 pr_debug(" %s\n", kobject_name(&sysdev->kobj)); 433 pr_debug(" %s\n", kobject_name(&sysdev->kobj));
434 434
435 /* Call auxillary drivers first */ 435 /* Call auxiliary drivers first */
436 list_for_each_entry(drv, &cls->drivers, entry) { 436 list_for_each_entry(drv, &cls->drivers, entry) {
437 if (drv->suspend) { 437 if (drv->suspend) {
438 ret = drv->suspend(sysdev, state); 438 ret = drv->suspend(sysdev, state);