ARM: OMAP: Frambuffer driver CodingStyle changes.

--
--Trilok Soni

From 4f6ac6400f75587094adff05da860d4540302a96 Mon Sep 17 00:00:00 2001
From: Trilok Soni <soni.trilok@gmail.com>
Date: Sat, 26 May 2007 19:19:19 +0530
Subject: [PATCH] ARM: OMAP: Frambuffer driver CodingStyle changes.

- Remove file paths, as it keeps changing and
  some the files were showing in-correct paths.
- Remove whitespaces and modify multi-line comments
  as per CodingStyle.
Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

drivers/video/omap/dispc.c

 /*
- * File: drivers/video/omap/omap2/dispc.c
- *
  * OMAP2 display controller support
  *
  * Copyright (C) 2005 Nokia Corporation
@@ -527,7 +525,8 @@ static int omap_dispc_set_scale(int plane,
 
 	enable_lcd_clocks(1);
 	if (orig_width < out_width) {
-		/* Upsampling.
+		/*
+		 * Upsampling.
 		 * Currently you can only scale both dimensions in one way.
 		 */
 		if (orig_height > out_height ||

drivers/video/omap/hwa742.c

 /*
- * File: drivers/video/omap/hwa742.c
- *
  * Epson HWA742 LCD controller driver
  *
  * Copyright (C) 2004-2005 Nokia Corporation
@@ -817,7 +815,8 @@ static int setup_tearsync(unsigned long pix_clk, int extif_div)
 	/* time to transfer one pixel (16bpp) in ps */
 	hwa742.pix_tx_time = hwa742.reg_timings.we_cycle_time;
 	if (hwa742.extif->get_max_tx_rate != NULL) {
-		/* The external interface might have a rate limitation,
+		/*
+		 * The external interface might have a rate limitation,
 		 * if so, we have to maximize our transfer rate.
 		 */
 		unsigned long min_tx_time;
@@ -834,24 +833,30 @@ static int setup_tearsync(unsigned long pix_clk, int extif_div)
 	hwa742.line_upd_time = (hdisp + hndp) * 1000000 / (pix_clk / 1000);
 	hwa742.line_upd_time *= 1000;
 	if (hdisp * hwa742.pix_tx_time > hwa742.line_upd_time)
-		/* transfer speed too low, we might have to use both
-		 * HS and VS */
+		/*
+		 * transfer speed too low, we might have to use both
+		 * HS and VS
+		 */
 		use_hsvs = 1;
 	else
 		/* decent transfer speed, we'll always use only VS */
 		use_hsvs = 0;
 
 	if (use_hsvs && (hs_pol_inv || vs_pol_inv)) {
-		/* HS or'ed with VS doesn't work, use the active high
-		 * TE signal based on HNDP / VNDP */
+		/*
+		 * HS or'ed with VS doesn't work, use the active high
+		 * TE signal based on HNDP / VNDP
+		 */
 		use_ndp = 1;
 		hs_pol_inv = 0;
 		vs_pol_inv = 0;
 		hs = hndp;
 		vs = vndp;
 	} else {
-		/* Use HS or'ed with VS as a TE signal if both are needed
-		 * or VNDP if only vsync is needed. */
+		/*
+		 * Use HS or'ed with VS as a TE signal if both are needed
+		 * or VNDP if only vsync is needed.
+		 */
 		use_ndp = 0;
 		hs = hsw;
 		vs = vsw;

drivers/video/omap/lcd_apollon.c

 /*
- * File: drivers/video/omap/lcd_apollon.c
- *
  * LCD panel support for the Samsung OMAP2 Apollon board
  *
  * Copyright (C) 2005,2006 Samsung Electronics

drivers/video/omap/lcd_h2.c

 /*
- * File: drivers/video/omap/lcd-h2.c
- *
  * LCD panel support for the TI OMAP H2 board
  *
  * Copyright (C) 2004 Nokia Corporation
@@ -46,7 +44,8 @@ static int h2_panel_enable(struct lcd_panel *panel)
 {
 	int r;
 
-	/* Assert LCD_EN, BKLIGHT_EN pins on LCD panel
+	/*
+	 * Assert LCD_EN, BKLIGHT_EN pins on LCD panel
 	 * page2, GPIO config reg, GPIO(0,1) to out and asserted
 	 */
 	r = tsc2101_write_sync(h2_panel_dev.tsc2101_dev, 2, 0x23, 0xcc00);
@@ -59,7 +58,8 @@ static int h2_panel_enable(struct lcd_panel *panel)
 
 static void h2_panel_disable(struct lcd_panel *panel)
 {
-	/* Deassert LCD_EN and BKLIGHT_EN pins on LCD panel
+	/*
+	 * Deassert LCD_EN and BKLIGHT_EN pins on LCD panel
 	 * page2, GPIO config reg, GPIO(0,1) to out and deasserted
 	 */
 	if (tsc2101_write_sync(h2_panel_dev.tsc2101_dev, 2, 0x23, 0x8800))

drivers/video/omap/lcd_h3.c

 /*
- * File: drivers/video/omap/lcd-h3.c
- *
  * LCD panel support for the TI OMAP H3 board
  *
  * Copyright (C) 2004 Nokia Corporation

drivers/video/omap/lcd_h4.c

 /*
- * File: drivers/video/omap/lcd-h4.c
- *
  * LCD panel support for the TI OMAP H4 board
  *
  * Copyright (C) 2004 Nokia Corporation

drivers/video/omap/lcd_inn1510.c

 /*
- * File: drivers/video/omap/lcd-inn1510.c
- *
  * LCD panel support for the TI OMAP1510 Innovator board
  *
  * Copyright (C) 2004 Nokia Corporation

drivers/video/omap/lcd_inn1610.c

 /*
- * File: drivers/video/omap/lcd-inn1610.c
- *
  * LCD panel support for the TI OMAP1610 Innovator board
  *
  * Copyright (C) 2004 Nokia Corporation

drivers/video/omap/lcd_mipid.c

 /*
- * File: drivers/video/omap/lcd_mipid.c
- *
  * LCD driver for MIPI DBI-C / DCS compatible LCDs
  *
  * Copyright (C) 2006 Nokia Corporation
@@ -198,7 +196,8 @@ static void set_sleep_mode(struct mipid_device *md, int on)
 	hw_guard_wait(md);
 	mipid_cmd(md, cmd);
 	hw_guard_start(md, 120);
-	/* When we enable the panel, it seems we _have_ to sleep
+	/*
+	 * When we enable the panel, it seems we _have_ to sleep
 	 * 120 ms before sending the init string. When disabling the
 	 * panel we'll sleep for the duration of 2 frames, so that the
 	 * controller can still provide the PCLK,HS,VS signals. */
@@ -425,8 +424,10 @@ static void mipid_disable(struct lcd_panel *panel)
 {
 	struct mipid_device *md = to_mipid_device(panel);
 
-	/* A final ESD work might be called before returning,
-	 * so do this without holding the lock. */
+	/*
+	 * A final ESD work might be called before returning,
+	 * so do this without holding the lock.
+	 */
 	mipid_esd_stop_check(md);
 	mutex_lock(&md->mutex);
 

drivers/video/omap/lcd_osk.c

 /*
- * File: drivers/video/omap/lcd-osk.c
- *
  * LCD panel support for the TI OMAP OSK board
  *
  * Copyright (C) 2004 Nokia Corporation

drivers/video/omap/lcd_p2.c

 /*
- * File: drivers/video/omap/lcd-p2.c
- *
  * LCD panel support for the TI OMAP P2 board
  *
  * Authors:

drivers/video/omap/lcd_palmte.c

 /*
- * File: drivers/video/omap/lcd_palmte.c
- *
  * LCD panel support for the Palm Tungsten E
  *
  * Original version : Romain Goyet

drivers/video/omap/lcd_palmtt.c

 /*
- * File: drivers/video/omap/lcd_palmtt.c
- *
  * LCD panel support for Palm Tungsten|T
  * Current version : Marek Vasut <marek.vasut@gmail.com>
  *

drivers/video/omap/lcd_palmz71.c

 /*
- * File: drivers/video/omap/lcd_palmz71.c
- *
  * LCD panel support for the Palm Zire71
  *
  * Original version : Romain Goyet

drivers/video/omap/lcd_sx1.c

 /*
- * File: drivers/video/omap/lcd_sx1.c
- *
  * LCD panel support for the Siemens SX1 mobile phone
  *
- * Current version : Vovan888 at gmail com, great help from FCA00000
+ * Current version : Vovan888@gmail com, great help from FCA00000
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -41,7 +39,7 @@
 #define GPIO_PIN_CONTROL	0xfffce018
 
 
-#define A_LCD_SSC_RD 	3
+#define A_LCD_SSC_RD	3
 #define A_LCD_SSC_SD	7
 #define _A_LCD_RESET	9
 #define _A_LCD_SSC_CS	12
@@ -266,16 +264,16 @@ struct lcd_panel sx1_panel = {
 			  OMAP_LCDC_INV_HSYNC | OMAP_LCDC_INV_PIX_CLOCK |
 			  OMAP_LCDC_INV_OUTPUT_EN,
 
-	.x_res 		= 176,
-	.y_res 		= 220,
+	.x_res		= 176,
+	.y_res		= 220,
 	.data_lines	= 16,
-	.bpp 		= 16,
-	.hsw 		= 5,
-	.hfp 		= 5,
-	.hbp 		= 5,
-	.vsw 		= 2,
-	.vfp 		= 1,
-	.vbp 		= 1,
+	.bpp		= 16,
+	.hsw		= 5,
+	.hfp		= 5,
+	.hbp		= 5,
+	.vsw		= 2,
+	.vfp		= 1,
+	.vbp		= 1,
 	.pixel_clock	= 1500,
 
 	.init		= sx1_panel_init,

drivers/video/omap/lcdc.c

 /*
- * File: drivers/video/omap/omap1/lcdc.c
- *
  * OMAP1 internal LCD controller
  *
  * Copyright (C) 2004 Nokia Corporation
@@ -158,7 +156,8 @@ static void disable_controller_async(void)
 
 	l = omap_readl(OMAP_LCDC_CONTROL);
 	mask = OMAP_LCDC_CTRL_LCD_EN | OMAP_LCDC_IRQ_MASK;
-	/* Preserve the DONE mask, since we still want to get the
+	/*
+	 * Preserve the DONE mask, since we still want to get the
 	 * final DONE irq. It will be disabled in the IRQ handler.
 	 */
 	mask &= ~OMAP_LCDC_IRQ_DONE;
@@ -197,7 +196,8 @@ static void reset_controller(u32 status)
 	}
 }
 
-/* Configure the LCD DMA according to the current mode specified by parameters
+/*
+ * Configure the LCD DMA according to the current mode specified by parameters
  * in lcdc.fbdev and fbdev->var.
  */
 static void setup_lcd_dma(void)
@@ -250,7 +250,8 @@ static void setup_lcd_dma(void)
 	if (!cpu_is_omap15xx()) {
 		int bpp = lcdc.bpp;
 
-		/* YUV support is only for external mode when we have the
+		/*
+		 * YUV support is only for external mode when we have the
 		 * YUV window embedded in a 16bpp frame buffer.
 		 */
 		if (lcdc.color_mode == OMAPFB_COLOR_YUV420)
@@ -277,7 +278,8 @@ static irqreturn_t lcdc_irq_handler(int irq, void *dev_id)
 		if (status & OMAP_LCDC_STAT_DONE) {
 			u32 l;
 
-			/* Disable IRQ_DONE. The status bit will be cleared
+			/*
+			 * Disable IRQ_DONE. The status bit will be cleared
 			 * only when the controller is reenabled and we don't
 			 * want to get more interrupts.
 			 */
@@ -292,7 +294,8 @@ static irqreturn_t lcdc_irq_handler(int irq, void *dev_id)
 		}
 	}
 
-	/* Clear these interrupt status bits.
+	/*
+	 * Clear these interrupt status bits.
 	 * Sync_lost, FUF bits were cleared by disabling the LCD controller
 	 * LOADED_PALETTE can be cleared this way only in palette only
 	 * load mode. In other load modes it's cleared by disabling the
@@ -306,7 +309,8 @@ static irqreturn_t lcdc_irq_handler(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-/* Change to a new video mode. We defer this to a later time to avoid any
+/*
+ * Change to a new video mode. We defer this to a later time to avoid any
  * flicker and not to mess up the current LCD DMA context. For this we disable
  * the LCD controler, which will generate a DONE irq after the last frame has
  * been transferred. Then it'll be safe to reconfigure both the LCD controller
@@ -410,7 +414,8 @@ static int omap_lcdc_enable_plane(int plane, int enable)
 	return 0;
 }
 
-/* Configure the LCD DMA for a palette load operation and do the palette
+/*
+ * Configure the LCD DMA for a palette load operation and do the palette
  * downloading synchronously. We don't use the frame+palette load mode of
  * the controller, since the palette can always be downloaded seperately.
  */
@@ -549,7 +554,8 @@ static void inline setup_regs(void)
 	panel->pixel_clock = lck / pcd / 1000;
 }
 
-/* Configure the LCD controller, download the color palette and start a looped
+/*
+ * Configure the LCD controller, download the color palette and start a looped
  * DMA transfer of the frame image data. Called only in internal
  * controller mode.
  */

drivers/video/omap/omapfb_main.c

 /*
- * File: drivers/video/omap/omapfb_main.c
- *
  * Framebuffer driver for TI OMAP boards
  *
  * Copyright (C) 2004 Nokia Corporation
@@ -138,7 +136,8 @@ static const int dma_elem_type[] = {
 	OMAP_DMA_DATA_TYPE_S32,
 };
 
-/* Allocate resources needed for LCD controller and LCD DMA operations. Video
+/*
+ * Allocate resources needed for LCD controller and LCD DMA operations. Video
  * memory is allocated from system memory according to the virtual display
  * size, except if a bigger memory size is specified explicitly as a kernel
  * parameter.
@@ -378,7 +377,8 @@ static void omapfb_sync(struct fb_info *fbi)
 	omapfb_rqueue_unlock(fbdev);
 }
 
-/* Set fb_info.fix fields and also updates fbdev.
+/*
+ * Set fb_info.fix fields and also updates fbdev.
  * When calling this fb_info.var must be set up already.
  */
 static void set_fb_fix(struct fb_info *fbi)
@@ -463,7 +463,8 @@ static int set_color_mode(struct omapfb_plane_struct *plane,
 	}
 }
 
-/* Check the values in var against our capabilities and in case of out of
+/*
+ * Check the values in var against our capabilities and in case of out of
  * bound values try to adjust them.
  */
 static int set_fb_var(struct fb_info *fbi,
@@ -609,7 +610,8 @@ static void omapfb_rotate(struct fb_info *fbi, int rotate)
 	omapfb_rqueue_unlock(fbdev);
 }
 
-/* Set new x,y offsets in the virtual display for the visible area and switch
+/*
+ * Set new x,y offsets in the virtual display for the visible area and switch
  * to the new mode.
  */
 static int omapfb_pan_display(struct fb_var_screeninfo *var,
@@ -659,7 +661,8 @@ static int omapfb_mirror(struct fb_info *fbi, int mirror)
 	return r;
 }
 
-/* Check values in var, try to adjust them in case of out of bound values if
+/*
+ * Check values in var, try to adjust them in case of out of bound values if
  * possible, or return error.
  */
 static int omapfb_check_var(struct fb_var_screeninfo *var, struct fb_info *fbi)
@@ -677,7 +680,8 @@ static int omapfb_check_var(struct fb_var_screeninfo *var, struct fb_info *fbi)
 	return r;
 }
 
-/* Switch to a new mode. The parameters for it has been check already by
+/*
+ * Switch to a new mode. The parameters for it has been check already by
  * omapfb_check_var.
  */
 static int omapfb_set_par(struct fb_info *fbi)
@@ -783,7 +787,8 @@ static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
 
 	omapfb_rqueue_lock(fbdev);
 	if (pi->enabled && !fbdev->mem_desc.region[plane->idx].size) {
-		/* This plane's memory was freed, can't enable it
+		/*
+		 * This plane's memory was freed, can't enable it
 		 * until it's reallocated.
 		 */
 		r = -EINVAL;
@@ -843,7 +848,8 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
 
 		rg->size = size;
 		rg->type = mi->type;
-		/* size == 0 is a special case, for which we
+		/*
+		 * size == 0 is a special case, for which we
 		 * don't check / adjust the screen parameters.
 		 * This isn't a problem since the plane can't
 		 * be reenabled unless its size is > 0.
@@ -873,7 +879,8 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
 				memcpy(&fbi->var, new_var, sizeof(fbi->var));
 				set_fb_fix(fbi);
 			} else {
-				/* Set these explicitly to indicate that the
+				/*
+				 * Set these explicitly to indicate that the
 				 * plane memory is dealloce'd, the other
 				 * screen parameters in var / fix are invalid.
 				 */
@@ -1045,7 +1052,8 @@ void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval)
 }
 EXPORT_SYMBOL(omapfb_write_first_pixel);
 
-/* Ioctl interface. Part of the kernel mode frame buffer API is duplicated
+/*
+ * Ioctl interface. Part of the kernel mode frame buffer API is duplicated
  * here to be accessible by user mode code.
  */
 static int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd,
@@ -1211,7 +1219,8 @@ static int omapfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 	return r;
 }
 
-/* Callback table for the frame buffer framework. Some of these pointers
+/*
+ * Callback table for the frame buffer framework. Some of these pointers
  * will be changed according to the current setting of fb_info->accel_flags.
  */
 static struct fb_ops omapfb_ops = {
@@ -1526,7 +1535,8 @@ static int planes_init(struct omapfb_device *fbdev)
 	return 0;
 }
 
-/* Free driver resources. Can be called to rollback an aborted initialization
+/*
+ * Free driver resources. Can be called to rollback an aborted initialization
  * sequence.
  */
 static void omapfb_free_resources(struct omapfb_device *fbdev, int state)
@@ -1607,7 +1617,8 @@ static void check_required_callbacks(struct omapfb_device *fbdev)
 #undef _C
 }
 
-/* Called by LDM binding to probe and attach a new device.
+/*
+ * Called by LDM binding to probe and attach a new device.
  * Initialization sequence:
  *   1. allocate system omapfb_device structure
  *   2. select controller type according to platform configuration

drivers/video/omap/rfbi.c

 /*
- * File: drivers/video/omap/omap2/rfbi.c
- *
  * OMAP2 Remote Frame Buffer Interface support
  *
  * Copyright (C) 2005 Nokia Corporation

drivers/video/omap/sossi.c

 /*
- * File: drivers/video/omap/omap1/sossi.c
- *
  * OMAP1 Special OptimiSed Screen Interface support
  *
  * Copyright (C) 2004-2005 Nokia Corporation
@@ -73,7 +71,8 @@ static struct {
 	int		clk_div;
 	u8		clk_tw0[2];
 	u8		clk_tw1[2];
-	/* if last_access is the same as current we don't have to change
+	/*
+	 * if last_access is the same as current we don't have to change
 	 * the timings
 	 */
 	int		last_access;
@@ -135,7 +134,8 @@ static int calc_rd_timings(struct extif_timings *t)
 	int reon, reoff, recyc, actim;
 	int div = t->clk_div;
 
-	/* Make sure that after conversion it still holds that:
+	/*
+	 * Make sure that after conversion it still holds that:
 	 * reoff > reon, recyc >= reoff, actim > reon
 	 */
 	reon = ps_to_sossi_ticks(t->re_on_time, div);
@@ -166,7 +166,8 @@ static int calc_rd_timings(struct extif_timings *t)
 	actim = ps_to_sossi_ticks(t->access_time, div);
 	if (actim < reoff)
 		actim++;
-	/* access time (data hold time) will be exactly one sossi
+	/*
+	 * access time (data hold time) will be exactly one sossi
 	 * tick
 	 */
 	if (actim - reoff > 1)
@@ -184,7 +185,8 @@ static int calc_wr_timings(struct extif_timings *t)
 	int weon, weoff, wecyc;
 	int div = t->clk_div;
 
-	/* Make sure that after conversion it still holds that:
+	/*
+	 * Make sure that after conversion it still holds that:
 	 * weoff > weon, wecyc >= weoff
 	 */
 	weon = ps_to_sossi_ticks(t->we_on_time, div);
@@ -367,7 +369,8 @@ static void sossi_set_bits_per_cycle(int bpc)
 {
 	int bus_pick_count, bus_pick_width;
 
-	/* We set explicitly the the bus_pick_count as well, although
+	/*
+	 * We set explicitly the the bus_pick_count as well, although
 	 * with remapping/reordering disabled it will be calculated by HW
 	 * as (32 / bus_pick_width).
 	 */
@@ -500,7 +503,8 @@ static void sossi_transfer_area(int width, int height,
 
 	sossi_start_transfer();
 	if (sossi.tearsync_mode) {
-		/* Wait for the sync signal and start the transfer only
+		/*
+		 * Wait for the sync signal and start the transfer only
 		 * then. We can't seem to be able to use HW sync DMA for
 		 * this since LCD DMA shows huge latencies, as if it
 		 * would ignore some of the DMA requests from SoSSI.
@@ -580,7 +584,8 @@ static int sossi_init(struct omapfb_device *fbdev)
 		dev_err(fbdev->dev, "can't get DPLL1OUT clock\n");
 		return PTR_ERR(dpll1out_ck);
 	}
-	/* We need the parent clock rate, which we might divide further
+	/*
+	 * We need the parent clock rate, which we might divide further
 	 * depending on the timing requirements of the controller. See
 	 * _set_timings.
 	 */