kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Derek Foreman 2017-08-03 15:07:53 -05:00
parent d8a9b895bb
commit afd65a8a99
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/ecore_drm2/Ecore_Drm2.h
View File

@ -188,16 +188,6 @@ EAPI Ecore_Drm2_Device *ecore_drm2_device_open(const char *seat, unsigned int tt
*/
EAPI void ecore_drm2_device_close(Ecore_Drm2_Device *device);
/**
* Free a given Ecore_Drm2_Device
*
* @param device
*
* @ingroup Ecore_Drm2_Device_Group
* @since 1.18
*/
EAPI void ecore_drm2_device_free(Ecore_Drm2_Device *device);
/**
* Get the type of clock used by a given Ecore_Drm2_Device
*

8
src/lib/ecore_drm2/ecore_drm2_device.c
View File

@ -682,17 +682,9 @@ EAPI void
ecore_drm2_device_close(Ecore_Drm2_Device *device)
{
EINA_SAFETY_ON_NULL_RETURN(device);
EINA_SAFETY_ON_TRUE_RETURN(device->fd < 0);
elput_input_shutdown(device->em);
elput_manager_close(device->em, device->fd);
}
EAPI void
ecore_drm2_device_free(Ecore_Drm2_Device *device)
{
EINA_SAFETY_ON_NULL_RETURN(device);
if (_ecore_drm2_use_atomic)
_drm2_atomic_state_free(device->state);

2
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
View File

@ -180,7 +180,6 @@ _ecore_evas_drm_init(Ecore_Evas *ee, Ecore_Evas_Engine_Drm_Data *edata, const ch
output_err:
ecore_drm2_device_close(edata->dev);
open_err:
ecore_drm2_device_free(edata->dev);
ecore_drm2_shutdown();
init_err:
return --_drm_init_count;
@ -194,7 +193,6 @@ _ecore_evas_drm_shutdown(Ecore_Evas_Engine_Drm_Data *edata)
ecore_drm2_outputs_destroy(edata->dev);
ecore_drm2_device_close(edata->dev);
ecore_drm2_device_free(edata->dev);
ecore_drm2_shutdown();
ecore_event_evas_shutdown();
EINA_LIST_FREE(handlers, h)