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.

diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h
index d90ee99..0468cbc 100644 (file)
--- 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
 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
  *
  * @param device

diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c b/src/lib/ecore_drm2/ecore_drm2_device.c
index 42a21c0..7ec4295 100644 (file)
--- a/src/lib/ecore_drm2/ecore_drm2_device.c
+++ b/src/lib/ecore_drm2/ecore_drm2_device.c
@@ -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);
 

diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index c8714ac..be1bd38 100644 (file)
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -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)