public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
YAMANE Toshiaki 2012-11-14 19:30:38 +09:00 • committed by Greg Kroah-Hartman
parent d21a9d3ba5
commit c7f904b334
1 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drivers/staging/omapdrm/omap_drv.c
View file

@ -51,9 +51,8 @@ static void omap_fb_output_poll_changed(struct drm_device *dev)
{ {
struct omap_drm_private *priv = dev->dev_private; struct omap_drm_private *priv = dev->dev_private;
DBG("dev=%p", dev); DBG("dev=%p", dev);
if (priv->fbdev) { if (priv->fbdev)
drm_fb_helper_hotplug_event(priv->fbdev); drm_fb_helper_hotplug_event(priv->fbdev);
}
} }
static const struct drm_mode_config_funcs omap_mode_config_funcs = { static const struct drm_mode_config_funcs omap_mode_config_funcs = {
@ -85,9 +84,9 @@ static int omap_drm_notifier(struct notifier_block *nb,
case OMAP_DSS_HOTPLUG_DISCONNECT: { case OMAP_DSS_HOTPLUG_DISCONNECT: {
struct drm_device *dev = drm_device; struct drm_device *dev = drm_device;
DBG("hotplug event: evt=%d, dev=%p", evt, dev); DBG("hotplug event: evt=%d, dev=%p", evt, dev);
if (dev) { if (dev)
drm_sysfs_hotplug_event(dev); drm_sysfs_hotplug_event(dev);
}
return NOTIFY_OK; return NOTIFY_OK;
} }
default: /* don't care about other events for now */ 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 = struct drm_encoder *encoder =
omap_connector_attached_encoder( omap_connector_attached_encoder(
priv->connectors[*j]); priv->connectors[*j]);
if (encoder) { if (encoder)
mgr = omap_encoder_get_manager(encoder); mgr = omap_encoder_get_manager(encoder);
}
} }
(*j)++; (*j)++;
} }
@ -232,9 +231,9 @@ static int create_crtc(struct drm_device *dev, struct omap_overlay *ovl,
struct drm_encoder *encoder = struct drm_encoder *encoder =
omap_connector_attached_encoder( omap_connector_attached_encoder(
priv->connectors[idx]); priv->connectors[idx]);
if (encoder) { if (encoder)
mgr = omap_encoder_get_manager(encoder); mgr = omap_encoder_get_manager(encoder);
}
} }
(*j)++; (*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); 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)); create_encoder(dev, omap_dss_get_overlay_manager(i));
}
for_each_dss_dev(dssdev) { for_each_dss_dev(dssdev) {
create_connector(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); VERB("%p:%p: handle=%d, op=%x", dev, file_priv, args->handle, args->op);
obj = drm_gem_object_lookup(dev, file_priv, args->handle); obj = drm_gem_object_lookup(dev, file_priv, args->handle);
if (!obj) { if (!obj)
return -ENOENT; return -ENOENT;
}
ret = omap_gem_op_sync(obj, args->op); ret = omap_gem_op_sync(obj, args->op);
if (!ret) { if (!ret)
ret = omap_gem_op_start(obj, args->op); ret = omap_gem_op_start(obj, args->op);
}
drm_gem_object_unreference_unlocked(obj); 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); VERB("%p:%p: handle=%d", dev, file_priv, args->handle);
obj = drm_gem_object_lookup(dev, file_priv, args->handle); obj = drm_gem_object_lookup(dev, file_priv, args->handle);
if (!obj) { if (!obj)
return -ENOENT; return -ENOENT;
}
/* XXX flushy, flushy */ /* XXX flushy, flushy */
ret = 0; ret = 0;
if (!ret) { if (!ret)
ret = omap_gem_op_finish(obj, args->op); ret = omap_gem_op_finish(obj, args->op);
}
drm_gem_object_unreference_unlocked(obj); 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); DBG("%p:%p: handle=%d", dev, file_priv, args->handle);
obj = drm_gem_object_lookup(dev, file_priv, args->handle); obj = drm_gem_object_lookup(dev, file_priv, args->handle);
if (!obj) { if (!obj)
return -ENOENT; return -ENOENT;
}
args->size = omap_gem_mmap_size(obj); args->size = omap_gem_mmap_size(obj);
args->offset = omap_gem_mmap_offset(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); drm_kms_helper_poll_init(dev);
ret = drm_vblank_init(dev, priv->num_crtcs); ret = drm_vblank_init(dev, priv->num_crtcs);
if (ret) { if (ret)
dev_warn(dev->dev, "could not init vblank\n"); dev_warn(dev->dev, "could not init vblank\n");
}
return 0; return 0;
} }