From 173d895d532d2ed75e2821fdbfa3b2eeb54c9a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 12 Apr 2021 16:18:12 +0200
Subject: [PATCH] kms: Remove now unused API to get file descriptor

The last user switched to using MetaDeviceFile, so time to clean up.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1828>
---
 src/backends/native/meta-gpu-kms.c         | 11 -----------
 src/backends/native/meta-gpu-kms.h         |  2 --
 src/backends/native/meta-kms-device.c      |  6 ------
 src/backends/native/meta-kms-device.h      |  2 --
 src/backends/native/meta-kms-impl-device.c |  9 ---------
 src/backends/native/meta-kms-impl-device.h |  2 --
 6 files changed, 32 deletions(-)

diff --git a/src/backends/native/meta-gpu-kms.c b/src/backends/native/meta-gpu-kms.c
index 6c0342113..97b47f9f9 100644
--- a/src/backends/native/meta-gpu-kms.c
+++ b/src/backends/native/meta-gpu-kms.c
@@ -104,12 +104,6 @@ meta_gpu_kms_get_kms_device (MetaGpuKms *gpu_kms)
   return gpu_kms->kms_device;
 }
 
-int
-meta_gpu_kms_get_fd (MetaGpuKms *gpu_kms)
-{
-  return gpu_kms->fd;
-}
-
 uint32_t
 meta_gpu_kms_get_id (MetaGpuKms *gpu_kms)
 {
@@ -399,16 +393,12 @@ meta_gpu_kms_new (MetaBackendNative  *backend_native,
                   GError            **error)
 {
   MetaGpuKms *gpu_kms;
-  int kms_fd;
-
-  kms_fd = meta_kms_device_leak_fd (kms_device);
 
   gpu_kms = g_object_new (META_TYPE_GPU_KMS,
                           "backend", backend_native,
                           NULL);
 
   gpu_kms->kms_device = kms_device;
-  gpu_kms->fd = kms_fd;
 
   meta_gpu_kms_read_current (META_GPU (gpu_kms), NULL);
 
@@ -420,7 +410,6 @@ meta_gpu_kms_init (MetaGpuKms *gpu_kms)
 {
   static uint32_t id = 0;
 
-  gpu_kms->fd = -1;
   gpu_kms->id = ++id;
 }
 
diff --git a/src/backends/native/meta-gpu-kms.h b/src/backends/native/meta-gpu-kms.h
index 051ea374a..06f6e100a 100644
--- a/src/backends/native/meta-gpu-kms.h
+++ b/src/backends/native/meta-gpu-kms.h
@@ -51,8 +51,6 @@ gboolean meta_gpu_kms_disable_modifiers (MetaGpuKms *gpu_kms);
 
 MetaKmsDevice * meta_gpu_kms_get_kms_device (MetaGpuKms *gpu_kms);
 
-int meta_gpu_kms_get_fd (MetaGpuKms *gpu_kms);
-
 uint32_t meta_gpu_kms_get_id (MetaGpuKms *gpu_kms);
 
 const char * meta_gpu_kms_get_file_path (MetaGpuKms *gpu_kms);
diff --git a/src/backends/native/meta-kms-device.c b/src/backends/native/meta-kms-device.c
index d958e0be6..f2ca52f47 100644
--- a/src/backends/native/meta-kms-device.c
+++ b/src/backends/native/meta-kms-device.c
@@ -74,12 +74,6 @@ meta_kms_device_get_impl_device (MetaKmsDevice *device)
   return device->impl_device;
 }
 
-int
-meta_kms_device_leak_fd (MetaKmsDevice *device)
-{
-  return meta_kms_impl_device_leak_fd (device->impl_device);
-}
-
 const char *
 meta_kms_device_get_path (MetaKmsDevice *device)
 {
diff --git a/src/backends/native/meta-kms-device.h b/src/backends/native/meta-kms-device.h
index c5e734a4c..58dda6136 100644
--- a/src/backends/native/meta-kms-device.h
+++ b/src/backends/native/meta-kms-device.h
@@ -31,8 +31,6 @@ G_DECLARE_FINAL_TYPE (MetaKmsDevice, meta_kms_device,
 
 MetaKms * meta_kms_device_get_kms (MetaKmsDevice *device);
 
-int meta_kms_device_leak_fd (MetaKmsDevice *device);
-
 const char * meta_kms_device_get_path (MetaKmsDevice *device);
 
 const char * meta_kms_device_get_driver_name (MetaKmsDevice *device);
diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c
index dbc6c57de..d288ec411 100644
--- a/src/backends/native/meta-kms-impl-device.c
+++ b/src/backends/native/meta-kms-impl-device.c
@@ -677,15 +677,6 @@ meta_kms_impl_device_get_fd (MetaKmsImplDevice *impl_device)
   return meta_device_file_get_fd (priv->device_file);
 }
 
-int
-meta_kms_impl_device_leak_fd (MetaKmsImplDevice *impl_device)
-{
-  MetaKmsImplDevicePrivate *priv =
-    meta_kms_impl_device_get_instance_private (impl_device);
-
-  return meta_device_file_get_fd (priv->device_file);
-}
-
 MetaKmsFeedback *
 meta_kms_impl_device_process_update (MetaKmsImplDevice *impl_device,
                                      MetaKmsUpdate     *update,
diff --git a/src/backends/native/meta-kms-impl-device.h b/src/backends/native/meta-kms-impl-device.h
index 4256cc20b..3826b2c5b 100644
--- a/src/backends/native/meta-kms-impl-device.h
+++ b/src/backends/native/meta-kms-impl-device.h
@@ -124,8 +124,6 @@ drmModePropertyPtr meta_kms_impl_device_find_property (MetaKmsImplDevice       *
 
 int meta_kms_impl_device_get_fd (MetaKmsImplDevice *impl_device);
 
-int meta_kms_impl_device_leak_fd (MetaKmsImplDevice *impl_device);
-
 void meta_kms_impl_device_update_states (MetaKmsImplDevice *impl_device);
 
 void meta_kms_impl_device_predict_states (MetaKmsImplDevice *impl_device,