From: Peter Hutterer Date: Thu, 30 Jan 2014 05:34:00 +0000 (+1000) Subject: evdev: factor out closing a device into evdev_suspend() X-Git-Tag: 0.7.0~143 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=702e8db2cfd7700f0c5a95656831df0e38475fc3;p=platform%2Fupstream%2Flibinput.git evdev: factor out closing a device into evdev_suspend() No functional changes, just prep work for an upcoming patch Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede --- diff --git a/src/evdev.c b/src/evdev.c index 71c52367..054beb63 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1165,8 +1165,8 @@ release_pressed_keys(struct evdev_device *device) } } -void -evdev_device_remove(struct evdev_device *device) +int +evdev_device_suspend(struct evdev_device *device) { if (device->source) libinput_remove_source(device->base.seat->libinput, @@ -1178,6 +1178,15 @@ evdev_device_remove(struct evdev_device *device) mtdev_close_delete(device->mtdev); close_restricted(device->base.seat->libinput, device->fd); device->fd = -1; + + return 0; +} + +void +evdev_device_remove(struct evdev_device *device) +{ + evdev_device_suspend(device); + list_remove(&device->base.link); notify_removed_device(&device->base); diff --git a/src/evdev.h b/src/evdev.h index 9de44bc8..ef02491c 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -186,6 +186,8 @@ double evdev_device_transform_y(struct evdev_device *device, double y, uint32_t height); +int +evdev_device_suspend(struct evdev_device *device); void evdev_keyboard_notify_key(struct evdev_device *device,