2023-06-06 10:57:07

by Siddh Raman Pant

Subject: [PATCH v9 4/8] drm: Remove usage of deprecated DRM_NOTE

drm_print.h says DRM_NOTE is deprecated in favor of drm_notice().

Signed-off-by: Siddh Raman Pant <[email protected]>
---
drivers/gpu/drm/drm_displayid.c | 2 +-
drivers/gpu/drm/drm_kms_helper_common.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c
index 9edc111be7ee..27ffeee09e4f 100644
--- a/drivers/gpu/drm/drm_displayid.c
+++ b/drivers/gpu/drm/drm_displayid.c
@@ -42,7 +42,7 @@ validate_displayid(const u8 *displayid, int length, int idx)
for (i = 0; i < dispid_length; i++)
csum += displayid[idx + i];
if (csum) {
- DRM_NOTE("DisplayID checksum invalid, remainder is %d\n", csum);
+ drm_notice(NULL, "DisplayID checksum invalid, remainder is %d\n", csum);
return ERR_PTR(-EINVAL);
}

diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c
index 0bf0fc1abf54..7a41373b67dc 100644
--- a/drivers/gpu/drm/drm_kms_helper_common.c
+++ b/drivers/gpu/drm/drm_kms_helper_common.c
@@ -41,7 +41,7 @@ MODULE_LICENSE("GPL and additional rights");
/* Backward compatibility for drm_kms_helper.edid_firmware */
static int edid_firmware_set(const char *val, const struct kernel_param *kp)
{
- DRM_NOTE("drm_kms_helper.edid_firmware is deprecated, please use drm.edid_firmware instead.\n");
+ drm_notice(NULL, "drm_kms_helper.edid_firmware is deprecated, please use drm.edid_firmware instead.\n");

return __drm_set_edid_firmware_path(val);
}
--
2.39.2

2023-06-06 15:00:59

by Laurent Pinchart

Subject: Re: [PATCH v9 4/8] drm: Remove usage of deprecated DRM_NOTE

Hi Siddh,

Thank you for the patch.

On Tue, Jun 06, 2023 at 04:15:18PM +0530, Siddh Raman Pant wrote:
> drm_print.h says DRM_NOTE is deprecated in favor of drm_notice().
>
> Signed-off-by: Siddh Raman Pant <[email protected]>

With the commit message fixed as mentioned in the review of an earlier
patch in this series,

Reviewed-by: Laurent Pinchart <[email protected]>

> ---
> drivers/gpu/drm/drm_displayid.c | 2 +-
> drivers/gpu/drm/drm_kms_helper_common.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c
> index 9edc111be7ee..27ffeee09e4f 100644
> --- a/drivers/gpu/drm/drm_displayid.c
> +++ b/drivers/gpu/drm/drm_displayid.c
> @@ -42,7 +42,7 @@ validate_displayid(const u8 *displayid, int length, int idx)
> for (i = 0; i < dispid_length; i++)
> csum += displayid[idx + i];
> if (csum) {
> - DRM_NOTE("DisplayID checksum invalid, remainder is %d\n", csum);
> + drm_notice(NULL, "DisplayID checksum invalid, remainder is %d\n", csum);
> return ERR_PTR(-EINVAL);
> }
>
> diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c
> index 0bf0fc1abf54..7a41373b67dc 100644
> --- a/drivers/gpu/drm/drm_kms_helper_common.c
> +++ b/drivers/gpu/drm/drm_kms_helper_common.c
> @@ -41,7 +41,7 @@ MODULE_LICENSE("GPL and additional rights");
> /* Backward compatibility for drm_kms_helper.edid_firmware */
> static int edid_firmware_set(const char *val, const struct kernel_param *kp)
> {
> - DRM_NOTE("drm_kms_helper.edid_firmware is deprecated, please use drm.edid_firmware instead.\n");
> + drm_notice(NULL, "drm_kms_helper.edid_firmware is deprecated, please use drm.edid_firmware instead.\n");
>
> return __drm_set_edid_firmware_path(val);
> }

--
Regards,

Laurent Pinchart