drm: omapdrm: Fix indentation of structure and array initializers

Indenting by one tab is enough.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index b0566a1ca28f3d59c228d9c500b4004ab44895ac..b9c3d8f830e8bc80bdb38e20e4b8d767e87067bc 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -174,15 +174,15 @@ static void omap_crtc_unregister_framedone_handler(
 }
 
 static const struct dss_mgr_ops mgr_ops = {
-               .connect = omap_crtc_connect,
-               .disconnect = omap_crtc_disconnect,
-               .start_update = omap_crtc_start_update,
-               .enable = omap_crtc_enable,
-               .disable = omap_crtc_disable,
-               .set_timings = omap_crtc_set_timings,
-               .set_lcd_config = omap_crtc_set_lcd_config,
-               .register_framedone_handler = omap_crtc_register_framedone_handler,
-               .unregister_framedone_handler = omap_crtc_unregister_framedone_handler,
+       .connect = omap_crtc_connect,
+       .disconnect = omap_crtc_disconnect,
+       .start_update = omap_crtc_start_update,
+       .enable = omap_crtc_enable,
+       .disable = omap_crtc_disable,
+       .set_timings = omap_crtc_set_timings,
+       .set_lcd_config = omap_crtc_set_lcd_config,
+       .register_framedone_handler = omap_crtc_register_framedone_handler,
+       .unregister_framedone_handler = omap_crtc_unregister_framedone_handler,
 };
 
 /*
@@ -658,10 +658,10 @@ void omap_crtc_flush(struct drm_crtc *crtc)
 }
 
 static const char *channel_names[] = {
-               [OMAP_DSS_CHANNEL_LCD] = "lcd",
-               [OMAP_DSS_CHANNEL_DIGIT] = "tv",
-               [OMAP_DSS_CHANNEL_LCD2] = "lcd2",
-               [OMAP_DSS_CHANNEL_LCD3] = "lcd3",
+       [OMAP_DSS_CHANNEL_LCD] = "lcd",
+       [OMAP_DSS_CHANNEL_DIGIT] = "tv",
+       [OMAP_DSS_CHANNEL_LCD2] = "lcd2",
+       [OMAP_DSS_CHANNEL_LCD3] = "lcd3",
 };
 
 void omap_crtc_pre_init(void)

diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index 56c60552abba36bbfcc7572ebe2d986cc548141a..b4476859c1adaf6277949801cef3dc0e8258c5ab 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -58,19 +58,19 @@ static const struct {
        uint32_t slot_w;        /* width of each slot (in pixels) */
        uint32_t slot_h;        /* height of each slot (in pixels) */
 } geom[TILFMT_NFORMATS] = {
-               [TILFMT_8BIT]  = GEOM(0, 0, 1),
-               [TILFMT_16BIT] = GEOM(0, 1, 2),
-               [TILFMT_32BIT] = GEOM(1, 1, 4),
-               [TILFMT_PAGE]  = GEOM(SLOT_WIDTH_BITS, SLOT_HEIGHT_BITS, 1),
+       [TILFMT_8BIT]  = GEOM(0, 0, 1),
+       [TILFMT_16BIT] = GEOM(0, 1, 2),
+       [TILFMT_32BIT] = GEOM(1, 1, 4),
+       [TILFMT_PAGE]  = GEOM(SLOT_WIDTH_BITS, SLOT_HEIGHT_BITS, 1),
 };
 
 
 /* lookup table for registers w/ per-engine instances */
 static const uint32_t reg[][4] = {
-               [PAT_STATUS] = {DMM_PAT_STATUS__0, DMM_PAT_STATUS__1,
-                               DMM_PAT_STATUS__2, DMM_PAT_STATUS__3},
-               [PAT_DESCR]  = {DMM_PAT_DESCR__0, DMM_PAT_DESCR__1,
-                               DMM_PAT_DESCR__2, DMM_PAT_DESCR__3},
+       [PAT_STATUS] = {DMM_PAT_STATUS__0, DMM_PAT_STATUS__1,
+                       DMM_PAT_STATUS__2, DMM_PAT_STATUS__3},
+       [PAT_DESCR]  = {DMM_PAT_DESCR__0, DMM_PAT_DESCR__1,
+                       DMM_PAT_DESCR__2, DMM_PAT_DESCR__3},
 };
 
 /* simple allocator to grab next 16 byte aligned memory from txn */

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 8241ed9b353c426176df85f19f9d1dff39aec866..642748cb7a4e500ed6fecce9f39f40fe7ebebe52 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -610,55 +610,55 @@ static const struct vm_operations_struct omap_gem_vm_ops = {
 };
 
 static const struct file_operations omapdriver_fops = {
-               .owner = THIS_MODULE,
-               .open = drm_open,
-               .unlocked_ioctl = drm_ioctl,
-               .release = drm_release,
-               .mmap = omap_gem_mmap,
-               .poll = drm_poll,
-               .read = drm_read,
-               .llseek = noop_llseek,
+       .owner = THIS_MODULE,
+       .open = drm_open,
+       .unlocked_ioctl = drm_ioctl,
+       .release = drm_release,
+       .mmap = omap_gem_mmap,
+       .poll = drm_poll,
+       .read = drm_read,
+       .llseek = noop_llseek,
 };
 
 static struct drm_driver omap_drm_driver = {
-               .driver_features =
-                               DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
-               .load = dev_load,
-               .unload = dev_unload,
-               .open = dev_open,
-               .lastclose = dev_lastclose,
-               .preclose = dev_preclose,
-               .postclose = dev_postclose,
-               .set_busid = drm_platform_set_busid,
-               .get_vblank_counter = drm_vblank_count,
-               .enable_vblank = omap_irq_enable_vblank,
-               .disable_vblank = omap_irq_disable_vblank,
-               .irq_preinstall = omap_irq_preinstall,
-               .irq_postinstall = omap_irq_postinstall,
-               .irq_uninstall = omap_irq_uninstall,
-               .irq_handler = omap_irq_handler,
+       .driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM
+                        | DRIVER_PRIME,
+       .load = dev_load,
+       .unload = dev_unload,
+       .open = dev_open,
+       .lastclose = dev_lastclose,
+       .preclose = dev_preclose,
+       .postclose = dev_postclose,
+       .set_busid = drm_platform_set_busid,
+       .get_vblank_counter = drm_vblank_count,
+       .enable_vblank = omap_irq_enable_vblank,
+       .disable_vblank = omap_irq_disable_vblank,
+       .irq_preinstall = omap_irq_preinstall,
+       .irq_postinstall = omap_irq_postinstall,
+       .irq_uninstall = omap_irq_uninstall,
+       .irq_handler = omap_irq_handler,
 #ifdef CONFIG_DEBUG_FS
-               .debugfs_init = omap_debugfs_init,
-               .debugfs_cleanup = omap_debugfs_cleanup,
+       .debugfs_init = omap_debugfs_init,
+       .debugfs_cleanup = omap_debugfs_cleanup,
 #endif
-               .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
-               .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
-               .gem_prime_export = omap_gem_prime_export,
-               .gem_prime_import = omap_gem_prime_import,
-               .gem_free_object = omap_gem_free_object,
-               .gem_vm_ops = &omap_gem_vm_ops,
-               .dumb_create = omap_gem_dumb_create,
-               .dumb_map_offset = omap_gem_dumb_map_offset,
-               .dumb_destroy = drm_gem_dumb_destroy,
-               .ioctls = ioctls,
-               .num_ioctls = DRM_OMAP_NUM_IOCTLS,
-               .fops = &omapdriver_fops,
-               .name = DRIVER_NAME,
-               .desc = DRIVER_DESC,
-               .date = DRIVER_DATE,
-               .major = DRIVER_MAJOR,
-               .minor = DRIVER_MINOR,
-               .patchlevel = DRIVER_PATCHLEVEL,
+       .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+       .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
+       .gem_prime_export = omap_gem_prime_export,
+       .gem_prime_import = omap_gem_prime_import,
+       .gem_free_object = omap_gem_free_object,
+       .gem_vm_ops = &omap_gem_vm_ops,
+       .dumb_create = omap_gem_dumb_create,
+       .dumb_map_offset = omap_gem_dumb_map_offset,
+       .dumb_destroy = drm_gem_dumb_destroy,
+       .ioctls = ioctls,
+       .num_ioctls = DRM_OMAP_NUM_IOCTLS,
+       .fops = &omapdriver_fops,
+       .name = DRIVER_NAME,
+       .desc = DRIVER_DESC,
+       .date = DRIVER_DATE,
+       .major = DRIVER_MAJOR,
+       .minor = DRIVER_MINOR,
+       .patchlevel = DRIVER_PATCHLEVEL,
 };
 
 static int pdev_suspend(struct platform_device *pDevice, pm_message_t state)
@@ -716,17 +716,17 @@ static const struct dev_pm_ops omapdrm_pm_ops = {
 #endif
 
 static struct platform_driver pdev = {
-               .driver = {
-                       .name = DRIVER_NAME,
+       .driver = {
+               .name = DRIVER_NAME,
 #ifdef CONFIG_PM
-                       .pm = &omapdrm_pm_ops,
+               .pm = &omapdrm_pm_ops,
 #endif
-               },
-               .probe = pdev_probe,
-               .remove = pdev_remove,
-               .suspend = pdev_suspend,
-               .resume = pdev_resume,
-               .shutdown = pdev_shutdown,
+       },
+       .probe = pdev_probe,
+       .remove = pdev_remove,
+       .suspend = pdev_suspend,
+       .resume = pdev_resume,
+       .shutdown = pdev_shutdown,
 };
 
 static int __init omap_drm_init(void)

diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
index a2dbfb1737b4583bf5d1b1b82220ee15185ccce8..b46dabd9faf75690c6782b20a7dd0b1c501bc160 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@ -156,16 +156,16 @@ static int omap_gem_dmabuf_mmap(struct dma_buf *buffer,
 }
 
 static struct dma_buf_ops omap_dmabuf_ops = {
-               .map_dma_buf = omap_gem_map_dma_buf,
-               .unmap_dma_buf = omap_gem_unmap_dma_buf,
-               .release = omap_gem_dmabuf_release,
-               .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
-               .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
-               .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
-               .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
-               .kmap = omap_gem_dmabuf_kmap,
-               .kunmap = omap_gem_dmabuf_kunmap,
-               .mmap = omap_gem_dmabuf_mmap,
+       .map_dma_buf = omap_gem_map_dma_buf,
+       .unmap_dma_buf = omap_gem_unmap_dma_buf,
+       .release = omap_gem_dmabuf_release,
+       .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
+       .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
+       .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
+       .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
+       .kmap = omap_gem_dmabuf_kmap,
+       .kunmap = omap_gem_dmabuf_kunmap,
+       .mmap = omap_gem_dmabuf_mmap,
 };
 
 struct dma_buf *omap_gem_prime_export(struct drm_device *dev,

diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index ee8e2b3a117ef59c183bd4cd63075ea565be98c1..a418fa7e5d0efa796b148f3cab04889959b9f47a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -353,10 +353,10 @@ int omap_plane_set_property(struct drm_plane *plane,
 }
 
 static const struct drm_plane_funcs omap_plane_funcs = {
-               .update_plane = omap_plane_update,
-               .disable_plane = omap_plane_disable,
-               .destroy = omap_plane_destroy,
-               .set_property = omap_plane_set_property,
+       .update_plane = omap_plane_update,
+       .disable_plane = omap_plane_disable,
+       .destroy = omap_plane_destroy,
+       .set_property = omap_plane_set_property,
 };
 
 static void omap_plane_error_irq(struct omap_drm_irq *irq, uint32_t irqstatus)
@@ -367,17 +367,17 @@ static void omap_plane_error_irq(struct omap_drm_irq *irq, uint32_t irqstatus)
 }
 
 static const char *plane_names[] = {
-               [OMAP_DSS_GFX] = "gfx",
-               [OMAP_DSS_VIDEO1] = "vid1",
-               [OMAP_DSS_VIDEO2] = "vid2",
-               [OMAP_DSS_VIDEO3] = "vid3",
+       [OMAP_DSS_GFX] = "gfx",
+       [OMAP_DSS_VIDEO1] = "vid1",
+       [OMAP_DSS_VIDEO2] = "vid2",
+       [OMAP_DSS_VIDEO3] = "vid3",
 };
 
 static const uint32_t error_irqs[] = {
-               [OMAP_DSS_GFX] = DISPC_IRQ_GFX_FIFO_UNDERFLOW,
-               [OMAP_DSS_VIDEO1] = DISPC_IRQ_VID1_FIFO_UNDERFLOW,
-               [OMAP_DSS_VIDEO2] = DISPC_IRQ_VID2_FIFO_UNDERFLOW,
-               [OMAP_DSS_VIDEO3] = DISPC_IRQ_VID3_FIFO_UNDERFLOW,
+       [OMAP_DSS_GFX] = DISPC_IRQ_GFX_FIFO_UNDERFLOW,
+       [OMAP_DSS_VIDEO1] = DISPC_IRQ_VID1_FIFO_UNDERFLOW,
+       [OMAP_DSS_VIDEO2] = DISPC_IRQ_VID2_FIFO_UNDERFLOW,
+       [OMAP_DSS_VIDEO3] = DISPC_IRQ_VID3_FIFO_UNDERFLOW,
 };
 
 /* initialize plane */