From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBA8BC3DA7A for ; Tue, 20 Dec 2022 20:17:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234024AbiLTURw (ORCPT ); Tue, 20 Dec 2022 15:17:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233028AbiLTURh (ORCPT ); Tue, 20 Dec 2022 15:17:37 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6879DBB9 for ; Tue, 20 Dec 2022 12:17:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671567421; cv=none; d=zohomail.in; s=zohoarc; b=ZZ3Cn1LzWaB2b2g9EzB96b3U+p+HkUtUoCidMJwmZfNzMqqMwwNhyYPaVdcicFA0jXk4L008AgQ3U/AD1OxEoEymw2ADuFvPVaB9rAGo4sIdke+713JwTgA8UoMpEpcPOpKgRAIb+Chu456RxqC23fWym27vYMZAONMo5liYs9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1671567421; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=SOPWJE5d02Vzl8zylY3TQdJgvgPJ1agqESFAbzCxsWc=; b=IN0ArUvUu+fYhn6xTtELAF508aNe5TwmG0iZ6EEtafZfiGVc7BPNNRqXMTPVD6nfUCgSPoP8TIFAdLhKPcpz+sC2BB6PmoClKa9SMoLh07Cq8yT3j3fB0bVl1e4m5DqTdm0X18rKdtD7J4Y+3RrMDwqn7ZiO1QJ2lIMs3Yx0F1E= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1671567421; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=SOPWJE5d02Vzl8zylY3TQdJgvgPJ1agqESFAbzCxsWc=; b=lgnTQRGwmsBUMMMnk5ePbGgupJvv767sqDRTZZUloEeojdEhLwK05LLeJRrdjEmr XgkUtvql+Oawe8lUl3omshzt/OUfaKyjfsGw2VpjBTIul3uoFDDaMGOtbPIcNyb/LPv y5UvkOrMz2JIJwqPy7K2GQQPjlYRn0iBKCR/dYEw= Received: from kampyooter.. (110.226.31.37 [110.226.31.37]) by mx.zoho.in with SMTPS id 1671567420947873.7402382604851; Wed, 21 Dec 2022 01:47:00 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel , linux-kernel Message-ID: <3ebf0d61ad5e82875a4493108602e62429306b14.1671566741.git.code@siddh.me> Subject: [PATCH 04/10] drm/print: Fix support for NULL as first argument of drm_dbg_* Date: Wed, 21 Dec 2022 01:46:39 +0530 X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset=utf8 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Comments say macros DRM_DEBUG_* are deprecated in favor of drm_dbg_*(NULL, ...), but they have broken support for it, as the macro will result in `(NULL) ? (NULL)->dev : NULL`. Thus, fix them by casting input drm to a temporary struct ptr, with the same convention as in __DRM_DEFINE_DBG_RATELIMITED. Signed-off-by: Siddh Raman Pant --- include/drm/drm_print.h | 89 ++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 20 deletions(-) diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index a44fb7ef257f..53702d830291 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -486,26 +486,75 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct= device *dev, =09__drm_printk((drm), err, _ratelimited, "*ERROR* " fmt, ##__VA_ARGS__) =20 =20 -#define drm_dbg_core(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_CORE, fmt, ##__VA_ARGS__) -#define drm_dbg_driver(drm, fmt, ...)=09=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRIVER, fmt, ##__VA_ARGS_= _) -#define drm_dbg_kms(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__) -#define drm_dbg_prime(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_PRIME, fmt, ##__VA_ARGS__= ) -#define drm_dbg_atomic(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_ATOMIC, fmt, ##__VA_ARGS_= _) -#define drm_dbg_vbl(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_VBL, fmt, ##__VA_ARGS__) -#define drm_dbg_state(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_STATE, fmt, ##__VA_ARGS__= ) -#define drm_dbg_lease(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_LEASE, fmt, ##__VA_ARGS__= ) -#define drm_dbg_dp(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DP, fmt, ##__VA_ARGS__) -#define drm_dbg_drmres(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRMRES, fmt, ##__VA_ARGS_= _) +#define drm_dbg_core(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_CORE,=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) + +#define drm_dbg_driver(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_DRIVER,=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) + +#define drm_dbg_kms(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_KMS,=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) + +#define drm_dbg_prime(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_PRIME,=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) + +#define drm_dbg_atomic(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_ATOMIC,=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) + +#define drm_dbg_vbl(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_VBL,=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) + +#define drm_dbg_state(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_STATE,=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) + +#define drm_dbg_lease(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_LEASE,=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) + +#define drm_dbg_dp(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_DP,=09=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) + +#define drm_dbg_drmres(drm, fmt, ...)=09=09=09=09\ +({=09=09=09=09=09=09=09=09\ +=09const struct drm_device *drm_ =3D (drm);=09=09=09\ +=09drm_dev_dbg(drm_ ? drm_->dev : NULL, DRM_UT_DRMRES,=09\ +=09=09 fmt, ##__VA_ARGS__);=09=09=09\ +}) =20 #define drm_dbg(drm, fmt, ...)=09drm_dbg_driver(drm, fmt, ##__VA_ARGS__) =20 --=20 2.35.1