[patch] drm/gma500: cleanup in psb_mode_operation_ioctl()

[Patrik Jakobsson]

On Tue, Feb 18, 2014 at 3:59 PM, Dan Carpenter <dan.carpenter at oracle.com> wrote:
> It looks like the "mode" test was changed at some point and but it
> wasn't totally cleaned up.  I've removed the unneeded indent block and
> the duplicative test for "if (mode)".
>
> Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>

Hi Dan,

Sorry for the late reply. This function will be removed in -next since it was
never used. It was part of the old Poulsbo reference driver where an open
userspace never materialized.

Thanks
Patrik

> diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
> index 1199180667c9..411ed5b80d53 100644
> --- a/drivers/gpu/drm/gma500/psb_drv.c
> +++ b/drivers/gpu/drm/gma500/psb_drv.c
> @@ -534,24 +534,22 @@ static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
>                 }
>
>                 /* drm_crtc_convert_umode(mode, umode); */
> -               {
> -                       mode->clock = umode->clock;
> -                       mode->hdisplay = umode->hdisplay;
> -                       mode->hsync_start = umode->hsync_start;
> -                       mode->hsync_end = umode->hsync_end;
> -                       mode->htotal = umode->htotal;
> -                       mode->hskew = umode->hskew;
> -                       mode->vdisplay = umode->vdisplay;
> -                       mode->vsync_start = umode->vsync_start;
> -                       mode->vsync_end = umode->vsync_end;
> -                       mode->vtotal = umode->vtotal;
> -                       mode->vscan = umode->vscan;
> -                       mode->vrefresh = umode->vrefresh;
> -                       mode->flags = umode->flags;
> -                       mode->type = umode->type;
> -                       strncpy(mode->name, umode->name, DRM_DISPLAY_MODE_LEN);
> -                       mode->name[DRM_DISPLAY_MODE_LEN-1] = 0;
> -               }
> +               mode->clock = umode->clock;
> +               mode->hdisplay = umode->hdisplay;
> +               mode->hsync_start = umode->hsync_start;
> +               mode->hsync_end = umode->hsync_end;
> +               mode->htotal = umode->htotal;
> +               mode->hskew = umode->hskew;
> +               mode->vdisplay = umode->vdisplay;
> +               mode->vsync_start = umode->vsync_start;
> +               mode->vsync_end = umode->vsync_end;
> +               mode->vtotal = umode->vtotal;
> +               mode->vscan = umode->vscan;
> +               mode->vrefresh = umode->vrefresh;
> +               mode->flags = umode->flags;
> +               mode->type = umode->type;
> +               strncpy(mode->name, umode->name, DRM_DISPLAY_MODE_LEN);
> +               mode->name[DRM_DISPLAY_MODE_LEN-1] = 0;
>
>                 connector_funcs = (struct drm_connector_helper_funcs *)
>                                    connector->helper_private;
> @@ -562,8 +560,7 @@ static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
>                 }
>
>                 /*do some clean up work*/
> -               if (mode)
> -                       drm_mode_destroy(dev, mode);
> +               drm_mode_destroy(dev, mode);
>  mode_op_out:
>                 drm_modeset_unlock_all(dev);
>                 return ret;