From patchwork Wed Dec 4 14:31:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13893880 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE743E77170 for ; Wed, 4 Dec 2024 14:31:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4DA6210E2A7; Wed, 4 Dec 2024 14:31:36 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="mYX+yngZ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id D858B10E2A7; Wed, 4 Dec 2024 14:31:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733322695; x=1764858695; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WSnr9Gs28zd/o19K+x0F05ubgL2i+J58mbFo2QtcJhk=; b=mYX+yngZKiGV69xEYAhyiy7CW3r1DVT2hrEQEdPl24IHsmO7R6k1iXl/ MFmMoGPPvQnL/T2NubVgm1oPh8MG4zTuLCYlMXXJ6rQquqC9UeK2gvuDy kkfZVALKvMt/S6h8P81r/kcXdsEOMl9DZFqKMK/FYAMzQtC5gdAmD2yGn 1Qu6RbQTBHPOkWvp50yivUI5FK5w2zojcUemIINz3OPQWQt83ebDLJjjH h3NEiPZGAjuEGuYxatNPlXIo4WJlSWJyyYY1JMeHOlxv7uCmxkBCaZGl7 niKiIWMvVyRe3yGS8hUqB0kvhgZfkKiPIWvUJYvEpBoYstN5yQJLiqYkS g==; X-CSE-ConnectionGUID: ot4UcoelRi+ubsZ6CFkevw== X-CSE-MsgGUID: hr18bjdqQI2E9e4zkeiDRg== X-IronPort-AV: E=McAfee;i="6700,10204,11276"; a="44255543" X-IronPort-AV: E=Sophos;i="6.12,207,1728975600"; d="scan'208";a="44255543" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2024 06:31:33 -0800 X-CSE-ConnectionGUID: RWrVFwaDQJawuBy/TS9v0w== X-CSE-MsgGUID: qnG6y7WzQneJtDQJ8TxR0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,207,1728975600"; d="scan'208";a="93963396" Received: from mwiniars-desk2.ger.corp.intel.com (HELO localhost) ([10.245.246.205]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2024 06:31:28 -0800 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Alex Deucher , Jacek Lawrynowicz , David Airlie , Maarten Lankhorst , Maxime Ripard , Oded Gabbay , Simona Vetter , Stanislaw Gruszka , Thomas Zimmermann Subject: [PATCH v2 2/3] accel/ivpu: remove DRIVER_DATE conditional drm_driver init Date: Wed, 4 Dec 2024 16:31:11 +0200 Message-Id: <0e4276552dde66dcdd275740cbc63d232cefd8f4.1733322525.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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. Acked-by: Alex Deucher Reviewed-by: Jacek Lawrynowicz Signed-off-by: Jani Nikula Reviewed-by: Thomas Zimmermann --- Note: I prefer to merge this together with the other patches via drm-misc-next. Cc: David Airlie Cc: Jacek Lawrynowicz Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Oded Gabbay Cc: Simona Vetter Cc: Stanislaw Gruszka Cc: Thomas Zimmermann Cc: dri-devel@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 ca2bf47ce248..1f359dbe5150 100644 --- a/drivers/accel/ivpu/ivpu_drv.c +++ b/drivers/accel/ivpu/ivpu_drv.c @@ -458,15 +458,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)