Re: [PATCH v2 2/5] drm/radeon: squash lines for simple wrapper functions

[Sean Paul]

On Wed, Sep 14, 2016 at 10:39 AM, Masahiro Yamada
<yamada.masahiro@xxxxxxxxxxxxx> wrote:
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>

Applied to drm-misc

Sean

> ---
>
>  drivers/gpu/drm/radeon/cik.c  | 6 +-----
>  drivers/gpu/drm/radeon/r100.c | 6 +-----
>  drivers/gpu/drm/radeon/r600.c | 6 +-----
>  3 files changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index b1784a1..f6ff41a 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -4193,11 +4193,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev,
>  u32 cik_gfx_get_wptr(struct radeon_device *rdev,
>                      struct radeon_ring *ring)
>  {
> -       u32 wptr;
> -
> -       wptr = RREG32(CP_RB0_WPTR);
> -
> -       return wptr;
> +       return RREG32(CP_RB0_WPTR);
>  }
>
>  void cik_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index f25994b..f5e84f4 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device *rdev,
>  u32 r100_gfx_get_wptr(struct radeon_device *rdev,
>                       struct radeon_ring *ring)
>  {
> -       u32 wptr;
> -
> -       wptr = RREG32(RADEON_CP_RB_WPTR);
> -
> -       return wptr;
> +       return RREG32(RADEON_CP_RB_WPTR);
>  }
>
>  void r100_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index 6406536..a951881 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device *rdev,
>  u32 r600_gfx_get_wptr(struct radeon_device *rdev,
>                       struct radeon_ring *ring)
>  {
> -       u32 wptr;
> -
> -       wptr = RREG32(R600_CP_RB_WPTR);
> -
> -       return wptr;
> +       return RREG32(R600_CP_RB_WPTR);
>  }
>
>  void r600_gfx_set_wptr(struct radeon_device *rdev,
> --
> 1.9.1
>