From: Youngjae Cho Date: Wed, 19 Jun 2024 04:14:15 +0000 (+0900) Subject: display: Remove display-plugin X-Git-Tag: accepted/tizen/8.0/unified/20240710.161341~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e2e17a811f5fb3dd5a88dcddfbfd16f71ba1cf9;p=platform%2Fcore%2Fsystem%2Fdeviced.git display: Remove display-plugin The display plugin has been replaced with the libsyscommon plugin api for the several previous patches. And finally, it is now totally replaced so remove the empty display-plugin from the deviced core. Change-Id: Ia3e78a7ac8a9aeda637efd7aaa556560da018493 Signed-off-by: Youngjae Cho --- diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c index 692bf6d6..aa24d582 100644 --- a/plugins/mobile/display/core.c +++ b/plugins/mobile/display/core.c @@ -61,7 +61,6 @@ #include "power/power-boot.h" #include "power/power-doze.h" #include "device-interface.h" -#include "display-plugin.h" #include "display-info.h" #include "display-signal.h" #include "display-lock.h" @@ -78,8 +77,6 @@ * @{ */ -static struct display_plugin *disp_plgn; - #define LOCK_SCREEN_WATING_TIME 300 /* 0.3 second */ #define LONG_PRESS_INTERVAL 400 /* 0.4 seconds */ #define SAMPLING_INTERVAL 1 /* 1 sec */ @@ -127,9 +124,6 @@ inline const struct syscommon_deviced_display_config* get_var_display_config() */ static int display_probe(void *data) { - struct display_plugin *dp = (struct display_plugin *) data; - assert(dp); - return 0; } @@ -152,13 +146,6 @@ static const struct device_ops display_plugin_device_ops = { }; DEVICE_OPS_REGISTER(&display_plugin_device_ops) - -static void __CONSTRUCTOR__ initialize(void) -{ - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) - _E("Failed to get display plugin variable."); -} /** * @} */ diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c index 7467cb1c..bca17774 100644 --- a/plugins/tv/display/core.c +++ b/plugins/tv/display/core.c @@ -61,7 +61,6 @@ #include "power/power-boot.h" #include "power/power-doze.h" #include "device-interface.h" -#include "display-plugin.h" #include "display-signal.h" #include "display-lock.h" #include "display-backlight.h" @@ -77,8 +76,6 @@ * @{ */ -static struct display_plugin *disp_plgn; - #define LOCK_SCREEN_WATING_TIME 300 /* 0.3 second */ #define LONG_PRESS_INTERVAL 2 /* 2 seconds */ #define SAMPLING_INTERVAL 1 /* 1 sec */ @@ -126,9 +123,6 @@ inline const struct syscommon_deviced_display_config* get_var_display_config() */ static int display_probe(void *data) { - struct display_plugin *dp = (struct display_plugin *) data; - assert(dp); - return 0; } @@ -151,13 +145,6 @@ static const struct device_ops display_plugin_device_ops = { }; DEVICE_OPS_REGISTER(&display_plugin_device_ops) - -static void __CONSTRUCTOR__ initialize(void) -{ - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) - _E("Failed to get display plugin variable."); -} /** * @} */ diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c index f2e0eb0a..99c80b8a 100644 --- a/plugins/tv/display/key-filter.c +++ b/plugins/tv/display/key-filter.c @@ -88,7 +88,6 @@ enum combination_process { COMBINATION_QUICKTALK = KEY_COMBINATION_POWERKEY | KEY_COMBINATION_VOLUMEDOWN, }; -static struct display_plugin *disp_plgn; static struct timeval pressed_time; static guint longkey_timeout_id = 0; static guint longkey_restore_id = 0; @@ -766,10 +765,6 @@ static struct syscommon_deviced_display_actor_ops display_menukey_actor = { static void __CONSTRUCTOR__ initialize(void) { - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) - _E("Failed to get display plugin variable."); - display_add_actor(&display_powerkey_actor); display_add_actor(&display_menukey_actor); diff --git a/plugins/wearable/display/auto-brightness-sensorhub.c b/plugins/wearable/display/auto-brightness-sensorhub.c index 10c2d7ac..c06d40aa 100644 --- a/plugins/wearable/display/auto-brightness-sensorhub.c +++ b/plugins/wearable/display/auto-brightness-sensorhub.c @@ -41,7 +41,6 @@ #define LOWBATCAPACITY 5 -static struct display_plugin *disp_plgn; static int auto_brightness_state = SETTING_BRIGHTNESS_AUTOMATIC_OFF; static bool lbm, hbm, hold_brt, lowdim; @@ -365,10 +364,3 @@ void exit_level_handler(void) syscommon_notifier_unsubscribe_notify(DEVICED_NOTIFIER_LCD_OFF, display_off_changed); syscommon_notifier_unsubscribe_notify(DEVICED_NOTIFIER_LCD_OFF_COMPLETE, display_off_complete_changed); } - -static void __CONSTRUCTOR__ initialize(void) -{ - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) - _E("Failed to get display plugin variable."); -} diff --git a/plugins/wearable/display/bezel.c b/plugins/wearable/display/bezel.c index c67b2e19..46ab00d2 100644 --- a/plugins/wearable/display/bezel.c +++ b/plugins/wearable/display/bezel.c @@ -47,7 +47,6 @@ enum bezel_type { static enum bezel_state bezel_wakeup_control(void); -static struct display_plugin *disp_plgn; static bool bezel_dev_available = false; static int bezel_wakeup = 0; static int theater_mode = 0; @@ -298,10 +297,3 @@ static const struct device_ops bezel_device_ops = { }; DEVICE_OPS_REGISTER(&bezel_device_ops) - -static void __CONSTRUCTOR__ initialize(void) -{ - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) - _E("Failed to get display plugin variable."); -} diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index 3755cea8..999c9a9d 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -64,7 +64,6 @@ #include "power/power-boot.h" #include "power/power-doze.h" #include "device-interface.h" -#include "display-plugin.h" #include "display-info.h" #include "battery-monitor.h" #include "display-signal.h" @@ -88,8 +87,6 @@ * @{ */ -static struct display_plugin *disp_plgn; - static enum device_ops_status status = DEVICE_OPS_STATUS_UNINIT; /* @@ -854,9 +851,6 @@ static void init_lcd_operation(void) */ static int display_probe(void *data) { - struct display_plugin *dp = (struct display_plugin *) data; - assert(dp); - /** * FIXME: They should be connected via plugin interfaces * @@ -964,14 +958,6 @@ static const struct device_ops display_plugin_device_ops = { DEVICE_OPS_REGISTER(&display_plugin_device_ops) -static void __CONSTRUCTOR__ initialize(void) -{ - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) - _E("Failed to get display plugin variable."); - -} - /** * @} */ diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c index b3c142d3..16ce9eb3 100644 --- a/plugins/wearable/display/key-filter.c +++ b/plugins/wearable/display/key-filter.c @@ -89,7 +89,6 @@ enum combination_process { COMBINATION_QUICKTALK = KEY_COMBINATION_POWERKEY | KEY_COMBINATION_VOLUMEDOWN, }; -static struct display_plugin *disp_plgn; static struct timeval pressed_time; static guint longkey_timeout_id = 0; static guint longkey_restore_id = 0; @@ -694,10 +693,6 @@ static struct syscommon_deviced_display_actor_ops display_menukey_actor = { static void __CONSTRUCTOR__ initialize(void) { - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) - _E("Failed to get display plugin variable."); - display_add_actor(&display_powerkey_actor); display_add_actor(&display_menukey_actor); diff --git a/plugins/wearable/display/swim.c b/plugins/wearable/display/swim.c index af0cb0da..50f19ddf 100644 --- a/plugins/wearable/display/swim.c +++ b/plugins/wearable/display/swim.c @@ -35,7 +35,6 @@ #define DBUS_COREAPPS_SWIMMODE_INTERFACE "org.tizen.coreapps.home.swimmode" #define DBUS_SWIMMODE_MEMBER_STATUS "status" -static struct display_plugin *disp_plgn; static const struct device_ops *touchscreen_ops; static int swimmode_status; @@ -147,10 +146,3 @@ static const struct device_ops swim_device_ops = { }; DEVICE_OPS_REGISTER(&swim_device_ops) - -static void __CONSTRUCTOR__ initialize(void) -{ - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) - _E("Failed to get display plugin variable."); -} diff --git a/src/battery/battery-time.c b/src/battery/battery-time.c index db087ea9..45cde462 100644 --- a/src/battery/battery-time.c +++ b/src/battery/battery-time.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "shared/common.h" #include "shared/devices.h" diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c index de47edc3..453abd61 100644 --- a/src/battery/lowbat-handler.c +++ b/src/battery/lowbat-handler.c @@ -47,7 +47,6 @@ #include "poll.h" #include "display-lock.h" #include "display-ops.h" -#include "display-plugin.h" #include "display-state-transition.h" #include "power/power.h" #include "power/power-off.h" diff --git a/src/display/device-interface.h b/src/display/device-interface.h index a1a6a541..42a286e9 100644 --- a/src/display/device-interface.h +++ b/src/display/device-interface.h @@ -28,7 +28,6 @@ #include #include "shared/devices.h" #include "display-backlight.h" -#include "display-plugin.h" #define FLAG_X_DPMS 0x2 diff --git a/src/display/display-backlight.c b/src/display/display-backlight.c index fae32e4b..654e6c99 100644 --- a/src/display/display-backlight.c +++ b/src/display/display-backlight.c @@ -29,7 +29,6 @@ #include "display-state-transition.h" #include "display-backlight.h" #include "display-panel.h" -#include "display-plugin.h" #define DUMP_MODE_WAITING_TIME 600000 /* milisecond */ #define LCD_PHASED_DELAY 10000 /* microsecond */ diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c index fcef9481..f93d9166 100644 --- a/src/display/display-dbus.c +++ b/src/display/display-dbus.c @@ -74,7 +74,6 @@ #define EXPIRED_POPUP_COMM "_APP_COMM_" #define EXPIRED_POPUP_ID "_REQUEST_ID_" -static struct display_plugin *disp_plgn; static char *custom_change_name; static GVariant *dbus_start(GDBusConnection *conn, @@ -1592,11 +1591,3 @@ int init_pm_dbus(void) return 0; } - -static void __CONSTRUCTOR__ initialize(void) -{ - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) { - _E("Failed to get display plugin variable."); - } -} diff --git a/src/display/display-dpms.c b/src/display/display-dpms.c index 77de7e56..17749b6e 100644 --- a/src/display/display-dpms.c +++ b/src/display/display-dpms.c @@ -31,7 +31,6 @@ #include "shared/device-notifier.h" #include "device-interface.h" #include "display-dpms.h" -#include "display-plugin.h" #include "device-interface.h" #include "core.h" diff --git a/src/display/display-lock.c b/src/display/display-lock.c index e04648cf..06fd15f2 100644 --- a/src/display/display-lock.c +++ b/src/display/display-lock.c @@ -32,7 +32,6 @@ #include "lock-detector.h" #include "display-lock.h" #include "display-panel.h" -#include "display-plugin.h" #include "display-config.h" #include "display-misc.h" #include "display-state-transition.h" diff --git a/src/display/display-misc.c b/src/display/display-misc.c index 50c0256f..ccfa8c10 100644 --- a/src/display/display-misc.c +++ b/src/display/display-misc.c @@ -34,7 +34,6 @@ #include "display-lock.h" #include "display-misc.h" #include "display-panel.h" -#include "display-plugin.h" #include "display-state-transition.h" #include "lock-detector.h" #include "poll.h" diff --git a/src/display/display-ops.h b/src/display/display-ops.h index 119c72d6..492822a9 100644 --- a/src/display/display-ops.h +++ b/src/display/display-ops.h @@ -21,7 +21,6 @@ #define __DISPLAY_OPS_H__ #include -#include "display-plugin.h" #include "shared/common.h" #include "shared/devices.h" //#include "display.h" diff --git a/src/display/display-panel.c b/src/display/display-panel.c index 65d2befd..603fc58a 100644 --- a/src/display/display-panel.c +++ b/src/display/display-panel.c @@ -29,7 +29,6 @@ #include "display-lock.h" #include "display-misc.h" #include "display-panel.h" -#include "display-plugin.h" #include "display-signal.h" #include "display-state-transition.h" #include "display-util.h" diff --git a/src/display/display-plugin.c b/src/display/display-plugin.c deleted file mode 100644 index 9fd01971..00000000 --- a/src/display/display-plugin.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * deviced - * - * Copyright (c) 2023 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include "display-plugin.h" -#include "display-config.h" -#include "shared/log-macro.h" - -struct display_plugin g_display_plugin; \ No newline at end of file diff --git a/src/display/display-plugin.h b/src/display/display-plugin.h deleted file mode 100644 index 8e39b2fd..00000000 --- a/src/display/display-plugin.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * deviced - * - * Copyright (c) 2023 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __DISPLAY_PLUGIN_H__ -#define __DISPLAY_PLUGIN_H__ - -#include -#include -#include - -#include "core.h" -#include "display-config.h" -#include "display-backlight.h" -#include "shared/devices.h" - -struct display_plugin { -}; -extern struct display_plugin g_display_plugin; - -#endif //__DISPLAY_PLUGIN_H__ diff --git a/src/display/display-signal.c b/src/display/display-signal.c index 7f7d2976..ddeecf2a 100644 --- a/src/display/display-signal.c +++ b/src/display/display-signal.c @@ -37,7 +37,6 @@ static const char *lcdoff_sig_lookup[SIGNAL_MAX] = { [SIGNAL_POST] = "LCDOffCompleted", }; -static struct display_plugin *disp_plgn; static long displayoff_time; void broadcast_lcd_on(enum signal_type type, enum deviced_event reason) @@ -139,10 +138,3 @@ void display_signal_unregister_display_brightness_notifier(void) { syscommon_notifier_unsubscribe_notify(DEVICED_NOTIFIER_DISPLAY_BRIGHTNESS, broadcast_brightness_changed); } - -static void __CONSTRUCTOR__ initialize(void) -{ - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) - _E("Failed to get display plugin variable."); -} diff --git a/src/display/display-state-transition.c b/src/display/display-state-transition.c index e24678df..bd627f48 100644 --- a/src/display/display-state-transition.c +++ b/src/display/display-state-transition.c @@ -32,7 +32,6 @@ #include "device-interface.h" #include "display-state-transition.h" #include "display-lock.h" -#include "display-plugin.h" #include "display-signal.h" #include "display-util.h" #include "extcon/extcon.h" diff --git a/src/display/display-util.c b/src/display/display-util.c index 6670ed47..a279a622 100644 --- a/src/display/display-util.c +++ b/src/display/display-util.c @@ -16,8 +16,10 @@ * limitations under the License. */ +#include + +#include "poll.h" #include "display-misc.h" -#include "display-plugin.h" #include "display-util.h" int display_util_get_display_state(int s_bits) diff --git a/src/display/display.c b/src/display/display.c index 7f1864bf..1cd4a682 100644 --- a/src/display/display.c +++ b/src/display/display.c @@ -34,7 +34,6 @@ #include "device-interface.h" #include "display.h" #include "display-lock.h" -#include "display-plugin.h" #include "display-config.h" #include "display-misc.h" #include "display-ops.h" @@ -514,7 +513,7 @@ static int display_probe(void *data) */ display_plugin_device_ops = find_device("display-plugin"); if (display_plugin_device_ops && display_plugin_device_ops->probe) { - ret = display_plugin_device_ops->probe(&g_display_plugin); + ret = display_plugin_device_ops->probe(NULL); if (ret < 0) return ret; } diff --git a/src/display/resource-display.c b/src/display/resource-display.c index 4da97536..dca5edfd 100644 --- a/src/display/resource-display.c +++ b/src/display/resource-display.c @@ -31,7 +31,6 @@ #include "device-interface.h" #include "display-misc.h" #include "display-lock.h" -#include "display-plugin.h" typedef union { int32_t i32; @@ -290,7 +289,7 @@ static int get_display_attr_data(int resource_id, break; case DEVICED_DISPLAY_ATTR_INT_CONFIG_POWERKEY_DOUBLEPRESS: /** - * FIXME: Directly access extern g_display_plugin. Fix it not to directly access + * FIXME: Directly access extern g_display_config. Fix it not to directly access * variable via extern. */ if (!g_display_config) @@ -300,7 +299,7 @@ static int get_display_attr_data(int resource_id, break; case DEVICED_DISPLAY_ATTR_DOUBLE_CONFIG_LONGPRESS_INTERVAL: /** - * FIXME: Directly access extern g_display_plugin. Fix it not to directly access + * FIXME: Directly access extern g_display_config. Fix it not to directly access * variable via extern. */ if (!g_display_config) @@ -310,7 +309,7 @@ static int get_display_attr_data(int resource_id, break; case DEVICED_DISPLAY_ATTR_INT_CONFIG_TOUCH_WAKEUP: /** - * FIXME: Directly access extern g_display_plugin. Fix it not to directly access + * FIXME: Directly access extern g_display_config. Fix it not to directly access * variable via extern. */ if (!g_display_config) diff --git a/src/display/setting.c b/src/display/setting.c index b361dffc..2c4a9ff2 100644 --- a/src/display/setting.c +++ b/src/display/setting.c @@ -27,7 +27,6 @@ #include "setting.h" #include "display-misc.h" #include "display-ops.h" -#include "display-plugin.h" #include "display-state-transition.h" #include "led/touch-key.h" #include "shared/log.h" @@ -47,7 +46,6 @@ static const char *setting_keys[SETTING_GET_END] = { [SETTING_EXCLUSIVE_DIM_TIMEOUT] = VCONFKEY_SETAPPL_TIMEOUT_DIM, }; -static struct display_plugin *disp_plgn; static int lock_screen_state = VCONFKEY_IDLE_UNLOCK; static bool lock_screen_bg_state = false; static int force_lcdtimeout = 0; @@ -429,9 +427,4 @@ static void __CONSTRUCTOR__ initialize(void) ret = vconf_get_int(VCONFKEY_SETAPPL_TIMEOUT_DIM, &exclusive_dim_timeout); if (ret < 0 || exclusive_dim_timeout < 0) exclusive_dim_timeout = EXCLUSIVE_DIM_TIMEOUT_UNSET; - - disp_plgn = get_var_display_plugin(); - if (!disp_plgn) { - _E("Failed to get display plugin variable."); - } } diff --git a/src/extcon/cradle.c b/src/extcon/cradle.c index d7c3e4d5..24a79531 100644 --- a/src/extcon/cradle.c +++ b/src/extcon/cradle.c @@ -28,7 +28,6 @@ #include "core.h" #include "display-lock.h" #include "display-ops.h" -#include "display-plugin.h" #include "display-state-transition.h" #include "extcon/extcon.h" #include "shared/plugin.h" diff --git a/src/extcon/earjack.c b/src/extcon/earjack.c index 14b38f06..c18c0cf4 100644 --- a/src/extcon/earjack.c +++ b/src/extcon/earjack.c @@ -26,7 +26,6 @@ #include "core/log.h" #include "poll.h" #include "display-ops.h" -#include "display-plugin.h" #include "display-state-transition.h" #include "extcon/extcon.h" #include "shared/plugin.h" diff --git a/src/led/touch-key.c b/src/led/touch-key.c index b6f7f8eb..d285935f 100644 --- a/src/led/touch-key.c +++ b/src/led/touch-key.c @@ -30,7 +30,6 @@ #include "core.h" #include "setting.h" #include "display-ops.h" -#include "display-plugin.h" #include "touch-key.h" #include "shared/plugin.h" diff --git a/src/shared/apps.c b/src/shared/apps.c index 1727922e..fb6df4ff 100644 --- a/src/shared/apps.c +++ b/src/shared/apps.c @@ -24,7 +24,6 @@ #include "core/log.h" #include "shared/common.h" #include "apps.h" -#include "display-plugin.h" #include "display-state-transition.h" #define POPUP_METHOD "PopupLaunch" diff --git a/src/shared/plugin.c b/src/shared/plugin.c index a31027b3..e5bf3a85 100644 --- a/src/shared/plugin.c +++ b/src/shared/plugin.c @@ -30,7 +30,6 @@ #include "plugin.h" #include "common.h" -#include "display-plugin.h" #include "core/log.h" #ifndef LIBPATH @@ -38,15 +37,9 @@ #endif #define MODULE_PATH LIBPATH"/deviced/" -extern struct display_plugin g_display_plugin; static struct battery_plugin battery_plgn; static GList *plgn_list; -inline struct display_plugin *get_var_display_plugin(void) -{ - return &g_display_plugin; -} - inline struct battery_plugin *get_var_battery_plugin(void) { return &battery_plgn; diff --git a/src/shared/plugin.h b/src/shared/plugin.h index 1d259cb0..c850041f 100644 --- a/src/shared/plugin.h +++ b/src/shared/plugin.h @@ -22,7 +22,6 @@ #include "display-ops.h" #include "battery/battery-ops.h" -struct display_plugin *get_var_display_plugin(void); struct battery_plugin *get_var_battery_plugin(void); int load_plugin(const char *id, void **h); diff --git a/src/time/time-handler.c b/src/time/time-handler.c index 5158f5ae..c53c98ef 100644 --- a/src/time/time-handler.c +++ b/src/time/time-handler.c @@ -39,7 +39,6 @@ #include "poll.h" #include "core.h" #include "display-ops.h" -#include "display-plugin.h" #include "shared/common.h" #include "shared/device-notifier.h" #include "shared/plugin.h" diff --git a/src/touchscreen/touchscreen.c b/src/touchscreen/touchscreen.c index 2bf2543c..66064bd3 100644 --- a/src/touchscreen/touchscreen.c +++ b/src/touchscreen/touchscreen.c @@ -30,7 +30,6 @@ #include "core.h" #include "display-ops.h" #include "display-panel.h" -#include "display-plugin.h" #include "display-config.h" #include "power/power-boot.h" #include "shared/plugin.h" diff --git a/src/usb-gadget/usb-gadget.c b/src/usb-gadget/usb-gadget.c index d6c42c7f..2df69512 100644 --- a/src/usb-gadget/usb-gadget.c +++ b/src/usb-gadget/usb-gadget.c @@ -26,7 +26,6 @@ #include "poll.h" #include "display-lock.h" #include "display-ops.h" -#include "display-plugin.h" #include "shared/plugin.h" #include "usb-gadget.h" diff --git a/src/usb-host/usb-host.c b/src/usb-host/usb-host.c index 86168c7a..731b8e29 100644 --- a/src/usb-host/usb-host.c +++ b/src/usb-host/usb-host.c @@ -34,7 +34,6 @@ #include "core/udev.h" #include "extcon/extcon.h" #include "display-ops.h" -#include "display-plugin.h" #include "display-config.h" #include "display-state-transition.h" #include "core.h" diff --git a/tests/deviced-common-private-test/test-mock.c b/tests/deviced-common-private-test/test-mock.c index df9d7feb..4b222481 100644 --- a/tests/deviced-common-private-test/test-mock.c +++ b/tests/deviced-common-private-test/test-mock.c @@ -2,15 +2,11 @@ #include #include -/* FIXME: This would be replaced to plugin-api-deviced */ -#include "display-plugin.h" #include "display-state-transition.h" #include "test-main.h" #include "test-mock.h" -struct display_plugin g_display_plugin; - int __wrap_access(const char *pathname, int mode) { return mock_type(int);