From 0779a03d3f84cc0d373a9235649f4ec7f49ba674 Mon Sep 17 00:00:00 2001 From: Alex Kang Date: Sat, 14 Oct 2023 16:08:47 -0700 Subject: [PATCH] Revert "feat(kscan): Add PM support to GPIO kscan drivers." This reverts commit eeeaec0d05dc75c348aec3f72e8fc90a3902d0ee. --- app/module/drivers/kscan/kscan_gpio_direct.c | 27 +------------------- app/module/drivers/kscan/kscan_gpio_matrix.c | 27 +------------------- 2 files changed, 2 insertions(+), 52 deletions(-) diff --git a/app/module/drivers/kscan/kscan_gpio_direct.c b/app/module/drivers/kscan/kscan_gpio_direct.c index c44debe5..5b227784 100644 --- a/app/module/drivers/kscan/kscan_gpio_direct.c +++ b/app/module/drivers/kscan/kscan_gpio_direct.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -319,28 +318,6 @@ static int kscan_direct_init(const struct device *dev) { return 0; } -#if IS_ENABLED(CONFIG_PM_DEVICE) - -static int kscan_direct_pm_action(const struct device *dev, enum pm_device_action action) { - int ret = 0; - - switch (action) { - case PM_DEVICE_ACTION_SUSPEND: - kscan_direct_disable(dev); - break; - case PM_DEVICE_ACTION_RESUME: - kscan_direct_enable(dev); - break; - default: - ret = -ENOTSUP; - break; - } - - return ret; -} - -#endif // IS_ENABLED(CONFIG_PM_DEVICE) - static const struct kscan_driver_api kscan_direct_api = { .config = kscan_direct_configure, .enable_callback = kscan_direct_enable, @@ -377,9 +354,7 @@ static const struct kscan_driver_api kscan_direct_api = { .toggle_mode = DT_INST_PROP(n, toggle_mode), \ }; \ \ - PM_DEVICE_DT_INST_DEFINE(n, kscan_direct_pm_action); \ - \ - DEVICE_DT_INST_DEFINE(n, &kscan_direct_init, PM_DEVICE_DT_INST_GET(n), &kscan_direct_data_##n, \ + DEVICE_DT_INST_DEFINE(n, &kscan_direct_init, NULL, &kscan_direct_data_##n, \ &kscan_direct_config_##n, POST_KERNEL, CONFIG_KSCAN_INIT_PRIORITY, \ &kscan_direct_api); diff --git a/app/module/drivers/kscan/kscan_gpio_matrix.c b/app/module/drivers/kscan/kscan_gpio_matrix.c index de2e1127..0d8a3190 100644 --- a/app/module/drivers/kscan/kscan_gpio_matrix.c +++ b/app/module/drivers/kscan/kscan_gpio_matrix.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -422,28 +421,6 @@ static int kscan_matrix_init(const struct device *dev) { return 0; } -#if IS_ENABLED(CONFIG_PM_DEVICE) - -static int kscan_matrix_pm_action(const struct device *dev, enum pm_device_action action) { - int ret = 0; - - switch (action) { - case PM_DEVICE_ACTION_SUSPEND: - kscan_matrix_disable(dev); - break; - case PM_DEVICE_ACTION_RESUME: - kscan_matrix_enable(dev); - break; - default: - ret = -ENOTSUP; - break; - } - - return ret; -} - -#endif // IS_ENABLED(CONFIG_PM_DEVICE) - static const struct kscan_driver_api kscan_matrix_api = { .config = kscan_matrix_configure, .enable_callback = kscan_matrix_enable, @@ -488,9 +465,7 @@ static const struct kscan_driver_api kscan_matrix_api = { .diode_direction = INST_DIODE_DIR(n), \ }; \ \ - PM_DEVICE_DT_INST_DEFINE(n, kscan_matrix_pm_action); \ - \ - DEVICE_DT_INST_DEFINE(n, &kscan_matrix_init, PM_DEVICE_DT_INST_GET(n), &kscan_matrix_data_##n, \ + DEVICE_DT_INST_DEFINE(n, &kscan_matrix_init, NULL, &kscan_matrix_data_##n, \ &kscan_matrix_config_##n, POST_KERNEL, CONFIG_KSCAN_INIT_PRIORITY, \ &kscan_matrix_api);