Received-SPF: pass (google.com: domain of linux-kernel+bounces-199683-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Content-Type: text/plain;
	charset=us-ascii
Precedence: bulk
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\))
Subject: Re: [PATCH] drm: Combine identical if/elif code blocks
From: Thorsten Blum <thorsten.blum@toblux.com>
In-Reply-To: <CAB3Z9RJ3RXOMc887N3cJntC1U24HXLkS4jm72xZtcDxNawRN3Q@mail.gmail.com>
Date: Mon, 3 Jun 2024 22:19:05 +0200
Cc: David Airlie <airlied@gmail.com>,
 Daniel Vetter <daniel@ffwll.ch>,
 Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
 Maxime Ripard <mripard@kernel.org>,
 Thomas Zimmermann <tzimmermann@suse.de>,
 dri-devel@lists.freedesktop.org,
 linux-kernel@vger.kernel.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <6365BD12-0283-4FCA-B84B-95DD6ADB5438@toblux.com>
References: <20240513212836.292589-3-thorsten.blum@toblux.com>
 <CAB3Z9RJ+VVAvVfKWF2LCzH3288vi6CF7uv+g+qbeu_L0c_k0Nw@mail.gmail.com>
 <60613D48-7C93-4B9F-894C-CE70E5F8D123@toblux.com>
 <227C6981-AFFC-4E0E-A95F-BF8979D5AD2A@toblux.com>
 <CAB3Z9RJ3RXOMc887N3cJntC1U24HXLkS4jm72xZtcDxNawRN3Q@mail.gmail.com>
To: Luc Ma <onion0709@gmail.com>

On 16. May 2024, at 03:24, Luc Ma <onion0709@gmail.com> wrote:
> On Wed, 15 May 2024 at 17:31, Thorsten Blum <thorsten.blum@toblux.com> =
wrote:
>> On 15. May 2024, at 11:22, Thorsten Blum <thorsten.blum@toblux.com> =
wrote:
>>> On 15. May 2024, at 09:43, Luc Ma <onion0709@gmail.com> wrote:
>>>> On Tue, 14 May 2024 at 19:37, Thorsten Blum =
<thorsten.blum@toblux.com> wrote:
>>>>>=20
>>>>> Merge the identical if/elif code blocks and remove the following =
two
>>>>> warnings reported by make includecheck:
>>>>>=20
>>>>>     asm/ioctl.h is included more than once
>>>>>     linux/types.h is included more than once
>>>>>=20
>>>>> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
>>>>> ---
>>>>> include/uapi/drm/drm.h | 8 +-------
>>>>> 1 file changed, 1 insertion(+), 7 deletions(-)
>>>>>=20
>>>>> 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_
>>>>>=20
>>>>> -#if defined(__KERNEL__)
>>>>> -
>>>>> -#include <linux/types.h>
>>>>> -#include <asm/ioctl.h>
>>>>> -typedef unsigned int drm_handle_t;
>>>>> -
>>>>> -#elif defined(__linux__)
>>>>=20
>>>> I think it is intentionally like that. Please see
>>>> https://patchwork.freedesktop.org/patch/78747/
>>>=20
>>> Thank you for the link.
>>>=20
>>> Does anyone know if the reason for the change from 2016 ("make
>>> headers_install can't handle fancy conditions, ...") is still valid?
>=20
> I guess it is. If you can try ./scripts/unifdef as below[1], you might
> find out the thing.
>=20
> =
[1]https://elixir.bootlin.com/linux/v6.9/source/scripts/headers_install.sh=
#L41

I just tested it with make headers_install and it worked fine.

Thorsten=