drm/gma500: cleanup in psb_mode_operation_ioctl()
Subsystems (4)
PATCH 1/1 drm/gma500: cleanup in psb_mode_operation_ioctl()
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 <[email protected]>
drivers/gpu/drm/gma500/psb_drv.c +17 -20
@@ -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;
Patrik Jakobsson
maintainerQuoted 5 lines · Dan Carpenter
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 <[email protected]>
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
Quoted 55 lines
drivers/gpu/drm/gma500/psb_drv.c +17
-20@@ -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;