[PATCH] drm: Combine identical if/elif code blocks

[Luc Ma]

Hi,

On Tue, 14 May 2024 at 19:37, Thorsten Blum <thorsten.blum at toblux.com> wrote:
>
> Merge the identical if/elif code blocks and remove the following two
> warnings reported by make includecheck:
>
>         asm/ioctl.h is included more than once
>         linux/types.h is included more than once
>
> Signed-off-by: Thorsten Blum <thorsten.blum at toblux.com>
> ---
>  include/uapi/drm/drm.h | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
> index 16122819edfe..315af7b19c97 100644
> --- a/include/uapi/drm/drm.h
> +++ b/include/uapi/drm/drm.h
> @@ -35,13 +35,7 @@
>  #ifndef _DRM_H_
>  #define _DRM_H_
>
> -#if defined(__KERNEL__)
> -
> -#include <linux/types.h>
> -#include <asm/ioctl.h>
> -typedef unsigned int drm_handle_t;
> -
> -#elif defined(__linux__)

I think it is intentionally like that. Please see
https://patchwork.freedesktop.org/patch/78747/

> +#if defined(__KERNEL__) || defined(__linux__)
>
>  #include <linux/types.h>
>  #include <asm/ioctl.h>
> --
> 2.45.0
>


Regards,
Luc