vmwgfx: Minor cleanups

As suggested by Konrad Rzeszutek Wilk

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index a98ee19bd6826149c4ecdd339525684548cf6653..ddb5abd6ac567b4c4828b556f79d2b4d877debc5 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -569,9 +569,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
        vmw_overlay_init(dev_priv);
 
        /* 3D Depends on Screen Objects being used. */
-       DRM_INFO("%s", vmw_fifo_have_3d(dev_priv) ?
-                "Detected device 3D availability.\n" :
-                "Detected no device 3D availability.\n");
+       DRM_INFO("Detected %sdevice 3D availability.\n",
+                vmw_fifo_have_3d(dev_priv) ?
+                "" : "no ");
 
        /* We might be done with the fifo now */
        if (dev_priv->enable_fb) {

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 0921cce442055e67bca307c3e8355653c1db289f..fc62c8798c4cf2d54cfb208c52b66cbc26f8613b 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1317,18 +1317,19 @@ int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num,
        struct drm_device *dev = dev_priv->dev;
        struct vmw_display_unit *du;
        struct drm_connector *con;
-       int i;
 
        mutex_lock(&dev->mode_config.mutex);
 
 #if 0
-       DRM_INFO("%s: new layout ", __func__);
-       for (i = 0; i < (int)num; i++)
-               DRM_INFO("(%i, %i %ux%u) ", rects[i].x, rects[i].y,
-                        rects[i].w, rects[i].h);
-       DRM_INFO("\n");
-#else
-       (void)i;
+       {
+               unsigned int i;
+
+               DRM_INFO("%s: new layout ", __func__);
+               for (i = 0; i < num; i++)
+                       DRM_INFO("(%i, %i %ux%u) ", rects[i].x, rects[i].y,
+                                rects[i].w, rects[i].h);
+               DRM_INFO("\n");
+       }
 #endif
 
        list_for_each_entry(con, &dev->mode_config.connector_list, head) {