[PATCH v2 2/3] accel/ivpu: remove DRIVER_DATE conditional drm_driver init

Jani Nikula jani.nikula at intel.com
Mon Oct 28 18:51:40 UTC 2024


The ivpu struct drm_driver has conditional initialization based on #ifdef
DRIVER_DATE, which is never defined anywhere. Neither are the macros
referenced within the block: DRIVER_DATE, DRIVER_MAJOR, DRIVER_MINOR,
and DRIVER_PATCHLEVEL. With the struct drm_driver date member going away
anyway, just remove the conditional compilation.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>

---

Note: I prefer to merge this together with the other patches via
drm-misc-next.

Cc: David Airlie <airlied at gmail.com>
Cc: Jacek Lawrynowicz <jacek.lawrynowicz at linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Cc: Maxime Ripard <mripard at kernel.org>
Cc: Oded Gabbay <ogabbay at kernel.org>
Cc: Simona Vetter <simona at ffwll.ch>
Cc: Stanislaw Gruszka <stanislaw.gruszka at linux.intel.com>
Cc: Thomas Zimmermann <tzimmermann at suse.de>
Cc: dri-devel at lists.freedesktop.org
---
 drivers/accel/ivpu/ivpu_drv.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
index e7d8967c02f2..07c7e5a5f22b 100644
--- a/drivers/accel/ivpu/ivpu_drv.c
+++ b/drivers/accel/ivpu/ivpu_drv.c
@@ -456,15 +456,8 @@ static const struct drm_driver driver = {
 	.name = DRIVER_NAME,
 	.desc = DRIVER_DESC,
 
-#ifdef DRIVER_DATE
-	.date = DRIVER_DATE,
-	.major = DRIVER_MAJOR,
-	.minor = DRIVER_MINOR,
-	.patchlevel = DRIVER_PATCHLEVEL,
-#else
 	.date = UTS_RELEASE,
 	.major = 1,
-#endif
 };
 
 static void ivpu_context_abort_invalid(struct ivpu_device *vdev)
-- 
2.39.5



More information about the dri-devel mailing list