@@ -720,41 +720,6 @@ static void sysrq_detect_reset_sequence(struct sysrq_state *state,
}
}
-#ifdef CONFIG_OF
-static void sysrq_of_get_keyreset_config(void)
-{
- u32 key;
- struct device_node *np;
- struct property *prop;
- const __be32 *p;
-
- np = of_find_node_by_path("/chosen/linux,sysrq-reset-seq");
- if (!np) {
- pr_debug("No sysrq node found");
- return;
- }
-
- /* Reset in case a __weak definition was present */
- sysrq_reset_seq_len = 0;
-
- of_property_for_each_u32(np, "keyset", prop, p, key) {
- if (key == KEY_RESERVED || key > KEY_MAX ||
- sysrq_reset_seq_len == SYSRQ_KEY_RESET_MAX)
- break;
-
- sysrq_reset_seq[sysrq_reset_seq_len++] = (unsigned short)key;
- }
-
- /* Get reset timeout if any. */
- of_property_read_u32(np, "timeout-ms", &sysrq_reset_downtime_ms);
-
- of_node_put(np);
-}
-#else
-static void sysrq_of_get_keyreset_config(void)
-{
-}
-#endif
static void sysrq_reinject_alt_sysrq(struct work_struct *work)
{
@@ -984,8 +949,6 @@ static inline void sysrq_register_handler(void)
{
int error;
- sysrq_of_get_keyreset_config();
-
error = input_register_handler(&sysrq_handler);
if (error)
pr_err("Failed to register input handler, error %d", error);
Nobody in the tree uses linux,sysrq-reset-seq in Device Tree source files. Remove the corresponding code. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> --- drivers/tty/sysrq.c | 37 ------------------------------------- 1 file changed, 37 deletions(-)