diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-15 03:20:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-16 16:16:19 -0400 |
commit | fa2b5ea09e48186041f68649ab8192447b31bffc (patch) | |
tree | ed4e5877d27eaa094aca79f746a774202a135a8c | |
parent | 359250105407bca72c0402ecb1bbb1d7636e0e82 (diff) |
serial: core: delete .set_wake() callback
This deletes the .set_wake() callback in the struct uart_ops.
Apparently this has been unused since pre-git times. In the
old-2.6-bkcvs it is deleted as part of a changeset removing
the PM_SET_WAKEUP from pm_request_t which is since also deleted
from the kernel.
The apropriate way to set wakeups in the kernel is to have a
code snippet like this in .suspend() or .runtime_suspend()
callbacks:
static int foo_suspend(struct device *dev)
{
if (device_may_wakeup(dev)) {
/* Enable wakeups, set internal states */
}
}
This specific callback is not coming back.
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | Documentation/serial/driver | 4 | ||||
-rw-r--r-- | include/linux/serial_core.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/serial/driver b/Documentation/serial/driver index 067c47d46917..c3a7689a90e6 100644 --- a/Documentation/serial/driver +++ b/Documentation/serial/driver | |||
@@ -264,10 +264,6 @@ hardware. | |||
264 | Locking: none. | 264 | Locking: none. |
265 | Interrupts: caller dependent. | 265 | Interrupts: caller dependent. |
266 | 266 | ||
267 | set_wake(port,state) | ||
268 | Enable/disable power management wakeup on serial activity. Not | ||
269 | currently implemented. | ||
270 | |||
271 | type(port) | 267 | type(port) |
272 | Return a pointer to a string constant describing the specified | 268 | Return a pointer to a string constant describing the specified |
273 | port, or return NULL, in which case the string 'unknown' is | 269 | port, or return NULL, in which case the string 'unknown' is |
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index b98291ac7f14..f729be981da0 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
@@ -66,7 +66,6 @@ struct uart_ops { | |||
66 | void (*set_ldisc)(struct uart_port *, int new); | 66 | void (*set_ldisc)(struct uart_port *, int new); |
67 | void (*pm)(struct uart_port *, unsigned int state, | 67 | void (*pm)(struct uart_port *, unsigned int state, |
68 | unsigned int oldstate); | 68 | unsigned int oldstate); |
69 | int (*set_wake)(struct uart_port *, unsigned int state); | ||
70 | 69 | ||
71 | /* | 70 | /* |
72 | * Return a string describing the type of the port | 71 | * Return a string describing the type of the port |