Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7f904b3 authored by YAMANE Toshiaki's avatar YAMANE Toshiaki Committed by Greg Kroah-Hartman
Browse files

staging/omapdrm: Fix spacing coding style in omap_drv.c 



The following warnings fixed.
- WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: default avatarYAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d21a9d3b

drivers/staging/omapdrm/omap_drv.c

+14 −22
Original line number Diff line number Diff line
@@ -51,10 +51,9 @@ static void omap_fb_output_poll_changed(struct drm_device *dev) 
{

	struct omap_drm_private *priv = dev->dev_private;

	DBG("dev=%p", dev);

	if (priv->fbdev) {

	if (priv->fbdev)

		drm_fb_helper_hotplug_event(priv->fbdev);

}

}



static const struct drm_mode_config_funcs omap_mode_config_funcs = {

	.fb_create = omap_framebuffer_create,
@@ -85,9 +84,9 @@ static int omap_drm_notifier(struct notifier_block *nb, 
	case OMAP_DSS_HOTPLUG_DISCONNECT: {

		struct drm_device *dev = drm_device;

		DBG("hotplug event: evt=%d, dev=%p", evt, dev);

		if (dev) {

		if (dev)

			drm_sysfs_hotplug_event(dev);

		}



		return NOTIFY_OK;

	}

	default:  /* don't care about other events for now */
@@ -211,9 +210,9 @@ static int create_crtc(struct drm_device *dev, struct omap_overlay *ovl, 
			struct drm_encoder *encoder =

				omap_connector_attached_encoder(

						priv->connectors[*j]);

			if (encoder) {

			if (encoder)

				mgr = omap_encoder_get_manager(encoder);

			}



		}

		(*j)++;

	}
@@ -232,9 +231,9 @@ static int create_crtc(struct drm_device *dev, struct omap_overlay *ovl, 
			struct drm_encoder *encoder =

				omap_connector_attached_encoder(

						priv->connectors[idx]);

			if (encoder) {

			if (encoder)

				mgr = omap_encoder_get_manager(encoder);

			}



		}

		(*j)++;

	}
@@ -353,9 +352,8 @@ static int omap_modeset_init(struct drm_device *dev) 
		 */

		int max_overlays = min(omap_dss_get_num_overlays(), num_crtc);



		for (i = 0; i < omap_dss_get_num_overlay_managers(); i++) {

		for (i = 0; i < omap_dss_get_num_overlay_managers(); i++)

			create_encoder(dev, omap_dss_get_overlay_manager(i));

		}



		for_each_dss_dev(dssdev) {

			create_connector(dev, dssdev);
@@ -468,15 +466,13 @@ static int ioctl_gem_cpu_prep(struct drm_device *dev, void *data, 
	VERB("%p:%p: handle=%d, op=%x", dev, file_priv, args->handle, args->op);



	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (!obj) {

	if (!obj)

		return -ENOENT;

	}



	ret = omap_gem_op_sync(obj, args->op);



	if (!ret) {

	if (!ret)

		ret = omap_gem_op_start(obj, args->op);

	}



	drm_gem_object_unreference_unlocked(obj);
@@ -493,16 +489,14 @@ static int ioctl_gem_cpu_fini(struct drm_device *dev, void *data, 
	VERB("%p:%p: handle=%d", dev, file_priv, args->handle);



	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (!obj) {

	if (!obj)

		return -ENOENT;

	}



	/* XXX flushy, flushy */

	ret = 0;



	if (!ret) {

	if (!ret)

		ret = omap_gem_op_finish(obj, args->op);

	}



	drm_gem_object_unreference_unlocked(obj);
@@ -519,9 +513,8 @@ static int ioctl_gem_info(struct drm_device *dev, void *data, 
	DBG("%p:%p: handle=%d", dev, file_priv, args->handle);



	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (!obj) {

	if (!obj)

		return -ENOENT;

	}



	args->size = omap_gem_mmap_size(obj);

	args->offset = omap_gem_mmap_offset(obj);
@@ -595,9 +588,8 @@ static int dev_load(struct drm_device *dev, unsigned long flags) 
	drm_kms_helper_poll_init(dev);



	ret = drm_vblank_init(dev, priv->num_crtcs);

	if (ret) {

	if (ret)

		dev_warn(dev->dev, "could not init vblank\n");

	}



	return 0;

}