2015-04-25 09:34:53

by Fabian Frédérick

Subject: [PATCH 1/1 linux-next] drm/i915: use ERR_CAST instead of ERR_PTR/PTR_ERR

Inspired by scripts/coccinelle/api/err_cast.cocci

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/gpu/drm/i915/intel_drv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 897f17d..d52f267 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1310,7 +1310,7 @@ intel_atomic_get_crtc_state(struct drm_atomic_state *state,
struct drm_crtc_state *crtc_state;
crtc_state = drm_atomic_get_crtc_state(state, &crtc->base);
if (IS_ERR(crtc_state))
- return ERR_PTR(PTR_ERR(crtc_state));
+ return ERR_CAST(crtc_state);

return to_intel_crtc_state(crtc_state);
}
--
1.9.1

2015-04-27 07:41:45

by Jani Nikula

Subject: Re: [PATCH 1/1 linux-next] drm/i915: use ERR_CAST instead of ERR_PTR/PTR_ERR

On Sat, 25 Apr 2015, Fabian Frederick <[email protected]> wrote:
> Inspired by scripts/coccinelle/api/err_cast.cocci
>
> Signed-off-by: Fabian Frederick <[email protected]>

Reviewed-by: Jani Nikula <[email protected]>


> ---
> drivers/gpu/drm/i915/intel_drv.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 897f17d..d52f267 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1310,7 +1310,7 @@ intel_atomic_get_crtc_state(struct drm_atomic_state *state,
> struct drm_crtc_state *crtc_state;
> crtc_state = drm_atomic_get_crtc_state(state, &crtc->base);
> if (IS_ERR(crtc_state))
> - return ERR_PTR(PTR_ERR(crtc_state));
> + return ERR_CAST(crtc_state);
>
> return to_intel_crtc_state(crtc_state);
> }
> --
> 1.9.1
>

--
Jani Nikula, Intel Open Source Technology Center

2015-05-04 14:28:35

by Daniel Vetter

Subject: Re: [Intel-gfx] [PATCH 1/1 linux-next] drm/i915: use ERR_CAST instead of ERR_PTR/PTR_ERR

On Mon, Apr 27, 2015 at 10:43:19AM +0300, Jani Nikula wrote:
> On Sat, 25 Apr 2015, Fabian Frederick <[email protected]> wrote:
> > Inspired by scripts/coccinelle/api/err_cast.cocci
> >
> > Signed-off-by: Fabian Frederick <[email protected]>
>
> Reviewed-by: Jani Nikula <[email protected]>

Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch