drm/i915: Remove i915_globals

No longer used.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727121037.2041102-10-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index ab76799576234fbdb7f7dfd03de57000f8e824c4..b73a0861b7ca7eedbb75eb144c385bd28f61092a 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -166,7 +166,6 @@ i915-y += \
          i915_gem_gtt.o \
          i915_gem_ww.o \
          i915_gem.o \
-         i915_globals.o \
          i915_query.o \
          i915_request.o \
          i915_scheduler.o \

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index cd7b96005d29eb94585a7fa6d0229e21b5ea0ec0..dea8e24798979a5f7832e9a714d104d428760b8a 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -6,7 +6,6 @@
 #include <linux/suspend.h>
 
 #include "i915_drv.h"
-#include "i915_globals.h"
 #include "i915_params.h"
 #include "intel_context.h"
 #include "intel_engine_pm.h"

diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c
deleted file mode 100644 (file)
index 0497978..0000000
--- a/drivers/gpu/drm/i915/i915_globals.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2019 Intel Corporation
- */
-
-#include <linux/slab.h>
-#include <linux/workqueue.h>
-
-#include "i915_globals.h"
-#include "i915_drv.h"
-
-static LIST_HEAD(globals);
-
-void __init i915_global_register(struct i915_global *global)
-{
-       GEM_BUG_ON(!global->exit);
-
-       list_add_tail(&global->link, &globals);
-}
-
-static void __i915_globals_cleanup(void)
-{
-       struct i915_global *global, *next;
-
-       list_for_each_entry_safe_reverse(global, next, &globals, link)
-               global->exit();
-}
-
-static __initconst int (* const initfn[])(void) = {
-};
-
-int __init i915_globals_init(void)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(initfn); i++) {
-               int err;
-
-               err = initfn[i]();
-               if (err) {
-                       __i915_globals_cleanup();
-                       return err;
-               }
-       }
-
-       return 0;
-}
-
-void i915_globals_exit(void)
-{
-       __i915_globals_cleanup();
-}

diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h
deleted file mode 100644 (file)
index 57d2998..0000000
--- a/drivers/gpu/drm/i915/i915_globals.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright © 2019 Intel Corporation
- */
-
-#ifndef _I915_GLOBALS_H_
-#define _I915_GLOBALS_H_
-
-#include <linux/types.h>
-
-typedef void (*i915_global_func_t)(void);
-
-struct i915_global {
-       struct list_head link;
-
-       i915_global_func_t exit;
-};
-
-void i915_global_register(struct i915_global *global);
-
-int i915_globals_init(void);
-void i915_globals_exit(void);
-
-#endif /* _I915_GLOBALS_H_ */

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 11a220e6a34f37842a8b970ddd07deb3b73f08c4..fbe7795a2027c4587fbfbe1b337d192a5e11badb 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -37,7 +37,6 @@
 #include "gem/i915_gem_object.h"
 #include "i915_request.h"
 #include "i915_perf.h"
-#include "i915_globals.h"
 #include "i915_selftest.h"
 #include "i915_scheduler.h"
 #include "i915_vma.h"
@@ -1274,7 +1273,6 @@ static const struct {
        { i915_request_module_init, i915_request_module_exit },
        { i915_scheduler_module_init, i915_scheduler_module_exit },
        { i915_vma_module_init, i915_vma_module_exit },
-       { i915_globals_init, i915_globals_exit },
        { i915_mock_selftests, NULL },
        { i915_pmu_init, i915_pmu_exit },
        { i915_register_pci_driver, i915_unregister_pci_driver },