[PATCH i-g-t 4/9] lib/igt_kmod: Remove unused low level __igt_intel_driver_unload()

Matt Roper matthew.d.roper at intel.com
Tue Nov 19 01:21:19 UTC 2024


On Mon, Nov 04, 2024 at 10:18:40PM -0800, Lucas De Marchi wrote:
> __igt_intel_driver_unload() is now unused and not needed.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  lib/igt_kmod.c | 47 -----------------------------------------------
>  lib/igt_kmod.h |  6 ------
>  2 files changed, 53 deletions(-)
> 
> diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
> index 0c093ec62..972dc490d 100644
> --- a/lib/igt_kmod.c
> +++ b/lib/igt_kmod.c
> @@ -605,53 +605,6 @@ int igt_audio_driver_unload(char **who)
>  	return igt_always_unload_audio_driver(who);
>  }
>  
> -int __igt_intel_driver_unload(char **who, const char *driver)
> -{
> -	int ret;
> -
> -	const char *aux[] = {
> -		/* gen5: ips uses symbol_get() so only a soft module dependency */
> -		"intel_ips",
> -		/* mei_gsc uses an i915 aux dev and the other mei mods depend on it */
> -		"mei_pxp",
> -		"mei_hdcp",
> -		"mei_gsc",
> -		NULL,
> -	};
> -
> -	/* unbind vt */
> -	bind_fbcon(false);
> -
> -	ret = igt_audio_driver_unload(who);
> -	if (ret)
> -		return ret;
> -
> -	for (const char **m = aux; *m; m++) {
> -		if (!igt_kmod_is_loaded(*m))
> -			continue;
> -
> -		ret = igt_kmod_unload(*m);
> -		if (ret) {
> -			if (who)
> -				*who = strdup_realloc(*who, *m);
> -
> -			return ret;
> -		}
> -	}
> -
> -	if (igt_kmod_is_loaded(driver)) {
> -		ret = igt_kmod_unload(driver);
> -		if (ret) {
> -			if (who)
> -				*who = strdup_realloc(*who, driver);
> -
> -			return ret;
> -		}
> -	}
> -
> -	return 0;
> -}
> -
>  /*
>   * Unbind driver from devices. Currently supports only PCI bus
>   */
> diff --git a/lib/igt_kmod.h b/lib/igt_kmod.h
> index 88d4a51e6..67ae6833f 100644
> --- a/lib/igt_kmod.h
> +++ b/lib/igt_kmod.h
> @@ -42,7 +42,6 @@ int igt_audio_driver_unload(char **whom);
>  
>  int igt_intel_driver_load(const char *opts, const char *driver);
>  int igt_intel_driver_unload(const char *driver);
> -int __igt_intel_driver_unload(char **who, const char *driver);
>  
>  static inline int igt_i915_driver_load(const char *opts)
>  {
> @@ -54,11 +53,6 @@ static inline int igt_i915_driver_unload(void)
>  	return igt_intel_driver_unload("i915");
>  }
>  
> -static inline int __igt_i915_driver_unload(char **whom)
> -{
> -	return __igt_intel_driver_unload(whom, "i915");
> -};
> -
>  static inline int igt_xe_driver_load(const char *opts)
>  {
>  	return igt_intel_driver_load(opts, "xe");
> -- 
> 2.47.0
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation


More information about the igt-dev mailing list