On 3/10/26 12:49, Philipp Hahn wrote:
> Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL
> check.
Looks like a reasonable cleanup but could be that driver maintainers want to
take that through their individual branches to avoid conflicts.
Alternatively when the i915 and rockship maintainers say that they are fine
with the change I'm happy to push this to drm-misc-next.
Regards,
Christian.
>
> Change generated with coccinelle.
>
> To: Andrzej Hajda
> To: Neil Armstrong
> To: Robert Foss
> To: Laurent Pinchart
> To: Jonas Karlman
> To: Jernej Skrabec
> To: Maarten Lankhorst
> To: Maxime Ripard
> To: Thomas Zimmermann
> To: David Airlie
> To: Simona Vetter
> To: Zhenyu Wang
> To: Zhi Wang
> To: Jani Nikula
> To: Joonas Lahtinen
> To: Rodrigo Vivi
> To: Tvrtko Ursulin
> To: Alex Deucher
> To: "Christian König"
> To: Sandy Huang
> To: "Heiko Stübner"
> To: Andy Yan
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Philipp Hahn
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
> drivers/gpu/drm/drm_sysfs.c | 2 +-
> drivers/gpu/drm/i915/gvt/scheduler.c| 4 ++--
> drivers/gpu/drm/radeon/radeon_test.c| 2 +-
> drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +-
> 5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index
> ee88c0e793b0416d20105a43448cb4037402e64b..64fa2bc8d28197147ee22b4f74134cc27dd9b32d
> 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -3608,7 +3608,7 @@ void dw_hdmi_remove(struct dw_hdmi *hdmi)
> {
> drm_bridge_remove(&hdmi->bridge);
>
> - if (hdmi->audio && !IS_ERR(hdmi->audio))
> + if (!IS_ERR_OR_NULL(hdmi->audio))
> platform_device_unregister(hdmi->audio);
> if (!IS_ERR(hdmi->cec))
> platform_device_unregister(hdmi->cec);
> diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
> index
> ef4e923a872843339743d21e4877225855da921e..6748acb4163e8f5658c9201a0412b38862c7baab
> 100644
> --- a/drivers/gpu/drm/drm_sysfs.c
> +++ b/drivers/gpu/drm/drm_sysfs.c
> @@ -600,7 +600,7 @@ struct device *drm_sysfs_minor_alloc(struct drm_minor
> *minor)
> */
> int drm_class_device_register(struct device *dev)
> {
> - if (!drm_class || IS_ERR(drm_class))
> + if (IS_ERR_OR_NULL(drm_class))
> return -ENOENT;
>
> dev->class = drm_class;
> diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c
> b/drivers/gpu/drm/i915/gvt/scheduler.c
> index
> 15fdd514ca836e84f4de95e3207ab45bb9243426..933ec5ffa1f1ebafd687996f167b982490702211
> 100644
> --- a/drivers/gpu/drm/i915/gvt/scheduler.c
> +++ b/drivers/gpu/drm/i915/gvt/scheduler.c
> @@ -675,10 +675,10 @@ static void release_shadow_batch_buffer(struct
> intel_vgpu_workload *workload)
> list_for_each_entry_safe(bb, pos, &workload->shadow_bb, list) {
> if (bb->obj) {
> i915_gem_object_lock(bb->obj, NULL);
> - if (bb->va && !IS_ERR(bb->va))
> + if (!IS_ERR_OR_NULL(bb->va))
> i915_gem_object_unpin_map(bb->obj);
>
> - if (bb->vma && !IS_ERR(bb->vma))
> + if (!IS_ERR_OR_NULL(bb->vma))
> i915_vma_unpin(bb->vma);
>
> i915_gem_object_unlock(bb->obj);
> diff --git a/drivers/gpu/drm/radeon/radeon_test.c
> b/drivers/gpu/drm/radeon/radeon_test.c
> index
> 0b459f7df23bae3eef7e36f4b5f35638fb6f4985..573284c4af60f12d7edec889260fc8a2e2b70420
> 100644
> --- a/drivers/gpu/drm/radeon/radeon_test.c
> +++ b/drivers/gpu/drm/radeon/radeon_test.c
> @@ -234,7 +234,7 @@ static void radeon_do_test_moves(struct radeon_device
> *rdev, int flag)
> radeon_bo_unreserve(gtt_obj[i]);
> radeon_bo_unref(>t_obj[i]);
> }
> - if (fence && !IS_ERR(fence))
> + if (!IS_ERR_OR_NULL(fence))
> radeon_fence_unref(&fence);
> break;
> }
> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
> b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
> index
> 3547d91b25d317c6cad690da7d97a7e5436c0236..8a267de85da9c76c2e29b2ababf1218e400282c2
> 100644
> --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
> +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
> @@ -1095,7 +1095,7 @@ static int dw_mipi_dsi_rockchip_host_detach(void
> *priv_data,
> struct device *second;
>
> second = dw_mipi_dsi_rockchip_find_second(dsi);
> - if (second && !IS_ERR(
