[v9,3/8] drm: Remove usage of deprecated DRM_INFO
Commit Message
drm_print.h says DRM_INFO is deprecated in favor of drm_info().
Signed-off-by: Siddh Raman Pant <code@siddh.me>
---
drivers/gpu/drm/drm_client_modeset.c | 2 +-
drivers/gpu/drm/drm_connector.c | 7 ++++---
drivers/gpu/drm/drm_drv.c | 2 +-
drivers/gpu/drm/drm_pci.c | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
Comments
Hi Siddh,
Thank you for the patch.
On Tue, Jun 06, 2023 at 04:15:17PM +0530, Siddh Raman Pant wrote:
> drm_print.h says DRM_INFO is deprecated in favor of drm_info().
>
> Signed-off-by: Siddh Raman Pant <code@siddh.me>
> ---
> drivers/gpu/drm/drm_client_modeset.c | 2 +-
> drivers/gpu/drm/drm_connector.c | 7 ++++---
> drivers/gpu/drm/drm_drv.c | 2 +-
> drivers/gpu/drm/drm_pci.c | 2 +-
Any plan to remove it from drivers as well ? If not you should mention
in the commit message (probably in the subject line itself) that you're
only addressing the DRM core.
Same comment for further patches in this series.
> 4 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
> index 1b12a3c201a3..ae19734974b5 100644
> --- a/drivers/gpu/drm/drm_client_modeset.c
> +++ b/drivers/gpu/drm/drm_client_modeset.c
> @@ -331,7 +331,7 @@ static bool drm_client_target_cloned(struct drm_device *dev,
> DRM_DEBUG_KMS("can clone using 1024x768\n");
> return true;
> }
> - DRM_INFO("kms: can't enable cloning when we probably wanted to.\n");
> + drm_info(dev, "kms: can't enable cloning when we probably wanted to.\n");
> return false;
> }
>
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index 48df7a5ea503..dca8dd4ab93f 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -168,13 +168,14 @@ static void drm_connector_get_cmdline_mode(struct drm_connector *connector)
> return;
>
> if (mode->force) {
> - DRM_INFO("forcing %s connector %s\n", connector->name,
> - drm_get_connector_force_name(mode->force));
> + drm_info(connector->dev, "forcing %s connector %s\n",
> + connector->name, drm_get_connector_force_name(mode->force));
> connector->force = mode->force;
> }
>
> if (mode->panel_orientation != DRM_MODE_PANEL_ORIENTATION_UNKNOWN) {
> - DRM_INFO("cmdline forces connector %s panel_orientation to %d\n",
> + drm_info(connector->dev,
> + "cmdline forces connector %s panel_orientation to %d\n",
> connector->name, mode->panel_orientation);
> drm_connector_set_panel_orientation(connector,
> mode->panel_orientation);
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 12687dd9e1ac..02eaa4c9344d 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -943,7 +943,7 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
> if (drm_core_check_feature(dev, DRIVER_MODESET))
> drm_modeset_register_all(dev);
>
> - DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
> + drm_info(dev, "Initialized %s %d.%d.%d %s for %s on minor %d\n",
> driver->name, driver->major, driver->minor,
> driver->patchlevel, driver->date,
> dev->dev ? dev_name(dev->dev) : "virtual device",
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 39d35fc3a43b..7dfb837d1325 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -262,7 +262,7 @@ void drm_legacy_pci_exit(const struct drm_driver *driver,
> }
> mutex_unlock(&legacy_dev_list_lock);
> }
> - DRM_INFO("Module unloaded\n");
> + drm_info(NULL, "Module unloaded\n");
> }
> EXPORT_SYMBOL(drm_legacy_pci_exit);
>
On Tue, 06 Jun 2023 19:53:22 +0530, Laurent Pinchart wrote:
> Hi Siddh,
>
> Thank you for the patch.
Anytime :)
> Any plan to remove it from drivers as well ? If not you should mention
> in the commit message (probably in the subject line itself) that you're
> only addressing the DRM core.
>
> Same comment for further patches in this series.
Yeah, this patch set aims to replace just in drm core (as mentioned in
the cover).
I thought "drm" would suffice since I did not specify a specific driver
like i915. So the subject line should say "drm core: ..."?
Thanks,
Siddh
On Tue, Jun 06, 2023 at 08:08:27PM +0530, Siddh Raman Pant wrote:
> On Tue, 06 Jun 2023 19:53:22 +0530, Laurent Pinchart wrote:
> > Hi Siddh,
> >
> > Thank you for the patch.
>
> Anytime :)
>
> > Any plan to remove it from drivers as well ? If not you should mention
> > in the commit message (probably in the subject line itself) that you're
> > only addressing the DRM core.
> >
> > Same comment for further patches in this series.
>
> Yeah, this patch set aims to replace just in drm core (as mentioned in
> the cover).
>
> I thought "drm" would suffice since I did not specify a specific driver
> like i915. So the subject line should say "drm core: ..."?
I would write
drm: Remove usage of deprecated DRM_INFO in DRM core
The "drm: " prefix doesn't imply you're touching the core only, you
could do a tree-wide change that also touches all drivers.
On Tue, 06 Jun 2023 20:16:25 +0530, Laurent Pinchart wrote:
> I would write
>
> drm: Remove usage of deprecated DRM_INFO in DRM core
>
> The "drm: " prefix doesn't imply you're touching the core only, you
> could do a tree-wide change that also touches all drivers.
Okay, will send a v10 with the change after resolving discussions in
other emails, if any.
Thanks,
Siddh
@@ -331,7 +331,7 @@ static bool drm_client_target_cloned(struct drm_device *dev,
DRM_DEBUG_KMS("can clone using 1024x768\n");
return true;
}
- DRM_INFO("kms: can't enable cloning when we probably wanted to.\n");
+ drm_info(dev, "kms: can't enable cloning when we probably wanted to.\n");
return false;
}
@@ -168,13 +168,14 @@ static void drm_connector_get_cmdline_mode(struct drm_connector *connector)
return;
if (mode->force) {
- DRM_INFO("forcing %s connector %s\n", connector->name,
- drm_get_connector_force_name(mode->force));
+ drm_info(connector->dev, "forcing %s connector %s\n",
+ connector->name, drm_get_connector_force_name(mode->force));
connector->force = mode->force;
}
if (mode->panel_orientation != DRM_MODE_PANEL_ORIENTATION_UNKNOWN) {
- DRM_INFO("cmdline forces connector %s panel_orientation to %d\n",
+ drm_info(connector->dev,
+ "cmdline forces connector %s panel_orientation to %d\n",
connector->name, mode->panel_orientation);
drm_connector_set_panel_orientation(connector,
mode->panel_orientation);
@@ -943,7 +943,7 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
if (drm_core_check_feature(dev, DRIVER_MODESET))
drm_modeset_register_all(dev);
- DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
+ drm_info(dev, "Initialized %s %d.%d.%d %s for %s on minor %d\n",
driver->name, driver->major, driver->minor,
driver->patchlevel, driver->date,
dev->dev ? dev_name(dev->dev) : "virtual device",
@@ -262,7 +262,7 @@ void drm_legacy_pci_exit(const struct drm_driver *driver,
}
mutex_unlock(&legacy_dev_list_lock);
}
- DRM_INFO("Module unloaded\n");
+ drm_info(NULL, "Module unloaded\n");
}
EXPORT_SYMBOL(drm_legacy_pci_exit);