Commit bb13ea28 authored by Simona Vetter's avatar Simona Vetter
Browse files

drm/i915: Remove i915_globals 



No longer used.

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

drivers/gpu/drm/i915/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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 \

drivers/gpu/drm/i915/gt/intel_gt_pm.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/i915/i915_globals.c

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/*

 * 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();

}

drivers/gpu/drm/i915/i915_globals.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * 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_ */

drivers/gpu/drm/i915/i915_pci.c

+0 −2
Original line number Diff line number Diff line
@@ -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 },