diff options
author | Derek Foreman <derekf@osg.samsung.com> | 2017-08-03 15:07:53 -0500 |
---|---|---|
committer | Derek Foreman <derekf@osg.samsung.com> | 2017-08-09 14:56:58 -0500 |
commit | afd65a8a99592de563bd6c3afac015b259c6aa0c (patch) | |
tree | 36695d75d05234fd5a812be1890248b1efc7cb1e /src/lib | |
parent | d8a9b895bb3c3e70c4b56441c0c34b981381a8d0 (diff) |
ecore_drm2: Merge ecore_drm2_device_free and _close
There's no reason to have them be separate, all callers must do them
back to back, so let's just combine them.
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/ecore_drm2/Ecore_Drm2.h | 10 | ||||
-rw-r--r-- | src/lib/ecore_drm2/ecore_drm2_device.c | 8 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h index d90ee99dc2..0468cbca5e 100644 --- a/src/lib/ecore_drm2/Ecore_Drm2.h +++ b/src/lib/ecore_drm2/Ecore_Drm2.h | |||
@@ -189,16 +189,6 @@ EAPI Ecore_Drm2_Device *ecore_drm2_device_open(const char *seat, unsigned int tt | |||
189 | EAPI void ecore_drm2_device_close(Ecore_Drm2_Device *device); | 189 | EAPI void ecore_drm2_device_close(Ecore_Drm2_Device *device); |
190 | 190 | ||
191 | /** | 191 | /** |
192 | * Free a given Ecore_Drm2_Device | ||
193 | * | ||
194 | * @param device | ||
195 | * | ||
196 | * @ingroup Ecore_Drm2_Device_Group | ||
197 | * @since 1.18 | ||
198 | */ | ||
199 | EAPI void ecore_drm2_device_free(Ecore_Drm2_Device *device); | ||
200 | |||
201 | /** | ||
202 | * Get the type of clock used by a given Ecore_Drm2_Device | 192 | * Get the type of clock used by a given Ecore_Drm2_Device |
203 | * | 193 | * |
204 | * @param device | 194 | * @param device |
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c b/src/lib/ecore_drm2/ecore_drm2_device.c index 42a21c0742..7ec429523b 100644 --- a/src/lib/ecore_drm2/ecore_drm2_device.c +++ b/src/lib/ecore_drm2/ecore_drm2_device.c | |||
@@ -682,17 +682,9 @@ EAPI void | |||
682 | ecore_drm2_device_close(Ecore_Drm2_Device *device) | 682 | ecore_drm2_device_close(Ecore_Drm2_Device *device) |
683 | { | 683 | { |
684 | EINA_SAFETY_ON_NULL_RETURN(device); | 684 | EINA_SAFETY_ON_NULL_RETURN(device); |
685 | EINA_SAFETY_ON_TRUE_RETURN(device->fd < 0); | ||
686 | 685 | ||
687 | elput_input_shutdown(device->em); | 686 | elput_input_shutdown(device->em); |
688 | elput_manager_close(device->em, device->fd); | 687 | elput_manager_close(device->em, device->fd); |
689 | } | ||
690 | |||
691 | EAPI void | ||
692 | ecore_drm2_device_free(Ecore_Drm2_Device *device) | ||
693 | { | ||
694 | EINA_SAFETY_ON_NULL_RETURN(device); | ||
695 | |||
696 | if (_ecore_drm2_use_atomic) | 688 | if (_ecore_drm2_use_atomic) |
697 | _drm2_atomic_state_free(device->state); | 689 | _drm2_atomic_state_free(device->state); |
698 | 690 | ||