diff options
Diffstat (limited to 'src/libsystemd-terminal/grdev-drm.c')
| -rw-r--r-- | src/libsystemd-terminal/grdev-drm.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/libsystemd-terminal/grdev-drm.c b/src/libsystemd-terminal/grdev-drm.c index bc4d4c9e76..4cee95f469 100644 --- a/src/libsystemd-terminal/grdev-drm.c +++ b/src/libsystemd-terminal/grdev-drm.c @@ -27,8 +27,6 @@ #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/types.h> -#include <systemd/sd-bus.h> -#include <systemd/sd-event.h> #include <unistd.h> /* Yuck! DRM headers need system headers included first.. but we have to @@ -37,13 +35,14 @@ #include <drm_fourcc.h> #include <drm_mode.h> -#include "bus-util.h" +#include "sd-bus.h" +#include "sd-event.h" #include "hashmap.h" -#include "grdev.h" -#include "grdev-internal.h" #include "macro.h" -#include "udev-util.h" #include "util.h" +#include "bus-util.h" +#include "grdev.h" +#include "grdev-internal.h" #define GRDRM_MAX_TRIES (16) @@ -2656,8 +2655,7 @@ static void managed_card_disable(grdev_card *card) { grdrm_card_disable(&cm->card); } -static int managed_card_pause_device_fn(sd_bus *bus, - sd_bus_message *signal, +static int managed_card_pause_device_fn(sd_bus_message *signal, void *userdata, sd_bus_error *ret_error) { managed_card *cm = userdata; @@ -2745,8 +2743,7 @@ static int managed_card_pause_device_fn(sd_bus *bus, return 0; } -static int managed_card_resume_device_fn(sd_bus *bus, - sd_bus_message *signal, +static int managed_card_resume_device_fn(sd_bus_message *signal, void *userdata, sd_bus_error *ret_error) { managed_card *cm = userdata; @@ -2848,8 +2845,7 @@ static int managed_card_setup_bus(managed_card *cm) { return 0; } -static int managed_card_take_device_fn(sd_bus *bus, - sd_bus_message *reply, +static int managed_card_take_device_fn(sd_bus_message *reply, void *userdata, sd_bus_error *ret_error) { managed_card *cm = userdata; |