Previously I used ERR_PTR(PTR_ERR()) to cast error pointers, but the
kernel test robot points out that there's a macro called ERR_CAST that
could do this.

Switch to this macro in the code.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202602242000.bQ0qN6AC-lkp@intel.com/
Signed-off-by: Icenowy Zheng <zhengxingda@iscas.ac.cn>
---
 drivers/gpu/drm/verisilicon/vs_bridge.c | 2 +-
 drivers/gpu/drm/verisilicon/vs_crtc.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/verisilicon/vs_bridge.c b/drivers/gpu/drm/verisilicon/vs_bridge.c
index 2a0ad00a94d6d..beebcab37ea48 100644
--- a/drivers/gpu/drm/verisilicon/vs_bridge.c
+++ b/drivers/gpu/drm/verisilicon/vs_bridge.c
@@ -322,7 +322,7 @@ struct vs_bridge *vs_bridge_init(struct drm_device *drm_dev,
 	bridge = devm_drm_bridge_alloc(drm_dev->dev, struct vs_bridge, base,
 				       bridge_funcs);
 	if (IS_ERR(bridge))
-		return ERR_PTR(PTR_ERR(bridge));
+		return ERR_CAST(bridge);
 
 	bridge->crtc = crtc;
 	bridge->intf = intf;
diff --git a/drivers/gpu/drm/verisilicon/vs_crtc.c b/drivers/gpu/drm/verisilicon/vs_crtc.c
index f494017130006..3685819e02505 100644
--- a/drivers/gpu/drm/verisilicon/vs_crtc.c
+++ b/drivers/gpu/drm/verisilicon/vs_crtc.c
@@ -172,7 +172,7 @@ struct vs_crtc *vs_crtc_init(struct drm_device *drm_dev, struct vs_dc *dc,
 	primary = vs_primary_plane_init(drm_dev, dc);
 	if (IS_ERR(primary)) {
 		drm_err(drm_dev, "Couldn't create the primary plane\n");
-		return ERR_PTR(PTR_ERR(primary));
+		return ERR_CAST(primary);
 	}
 
 	ret = drmm_crtc_init_with_planes(drm_dev, &vcrtc->base,
-- 
2.52.0

Am 05.03.26 um 09:17 schrieb Icenowy Zheng:
> Previously I used ERR_PTR(PTR_ERR()) to cast error pointers, but the
> kernel test robot points out that there's a macro called ERR_CAST that
> could do this.
>
> Switch to this macro in the code.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202602242000.bQ0qN6AC-lkp@intel.com/
> Signed-off-by: Icenowy Zheng <zhengxingda@iscas.ac.cn>

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
>   drivers/gpu/drm/verisilicon/vs_bridge.c | 2 +-
>   drivers/gpu/drm/verisilicon/vs_crtc.c   | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/verisilicon/vs_bridge.c b/drivers/gpu/drm/verisilicon/vs_bridge.c
> index 2a0ad00a94d6d..beebcab37ea48 100644
> --- a/drivers/gpu/drm/verisilicon/vs_bridge.c
> +++ b/drivers/gpu/drm/verisilicon/vs_bridge.c
> @@ -322,7 +322,7 @@ struct vs_bridge *vs_bridge_init(struct drm_device *drm_dev,
>   	bridge = devm_drm_bridge_alloc(drm_dev->dev, struct vs_bridge, base,
>   				       bridge_funcs);
>   	if (IS_ERR(bridge))
> -		return ERR_PTR(PTR_ERR(bridge));
> +		return ERR_CAST(bridge);
>   
>   	bridge->crtc = crtc;
>   	bridge->intf = intf;
> diff --git a/drivers/gpu/drm/verisilicon/vs_crtc.c b/drivers/gpu/drm/verisilicon/vs_crtc.c
> index f494017130006..3685819e02505 100644
> --- a/drivers/gpu/drm/verisilicon/vs_crtc.c
> +++ b/drivers/gpu/drm/verisilicon/vs_crtc.c
> @@ -172,7 +172,7 @@ struct vs_crtc *vs_crtc_init(struct drm_device *drm_dev, struct vs_dc *dc,
>   	primary = vs_primary_plane_init(drm_dev, dc);
>   	if (IS_ERR(primary)) {
>   		drm_err(drm_dev, "Couldn't create the primary plane\n");
> -		return ERR_PTR(PTR_ERR(primary));
> +		return ERR_CAST(primary);
>   	}
>   
>   	ret = drmm_crtc_init_with_planes(drm_dev, &vcrtc->base,

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)