Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: gma500: fix up trailing whitespace errors

Lots of little ones all through the driver, mostly
all in a cut-and-paste header comment.

Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+52 -52
+5 -5
drivers/staging/gma500/psb_drv.h
··· 12 12 * more details. 13 13 * 14 14 * You should have received a copy of the GNU General Public License along with 15 - * this program; if not, write to the Free Software Foundation, Inc., 15 + * this program; if not, write to the Free Software Foundation, Inc., 16 16 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 17 17 * 18 18 **************************************************************************/ ··· 232 232 #define MDFLD_DSR_MIPI_CONTROL BIT6 233 233 #define MDFLD_DSR_2D_3D (MDFLD_DSR_2D_3D_0 | MDFLD_DSR_2D_3D_2) 234 234 235 - #define MDFLD_DSR_RR 45 235 + #define MDFLD_DSR_RR 45 236 236 #define MDFLD_DPU_ENABLE BIT31 237 237 #define MDFLD_DSR_FULLSCREEN BIT30 238 238 #define MDFLD_DSR_DELAY (DRM_HZ / MDFLD_DSR_RR) ··· 344 344 345 345 struct drm_psb_private { 346 346 /* 347 - * DSI info. 347 + * DSI info. 348 348 */ 349 - void * dbi_dsr_info; 349 + void * dbi_dsr_info; 350 350 void * dsi_configs[2]; 351 351 352 352 /* ··· 387 387 uint8_t *sgx_reg; 388 388 uint8_t *vdc_reg; 389 389 uint32_t gatt_free_offset; 390 - 390 + 391 391 /* IMG video context */ 392 392 struct list_head video_ctx; 393 393
+1 -1
drivers/staging/gma500/psb_fb.h
··· 11 11 * more details. 12 12 * 13 13 * You should have received a copy of the GNU General Public License along with 14 - * this program; if not, write to the Free Software Foundation, Inc., 14 + * this program; if not, write to the Free Software Foundation, Inc., 15 15 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 16 16 * 17 17 * Authors:
+1 -1
drivers/staging/gma500/psb_gtt.h
··· 12 12 * more details. 13 13 * 14 14 * You should have received a copy of the GNU General Public License along with 15 - * this program; if not, write to the Free Software Foundation, Inc., 15 + * this program; if not, write to the Free Software Foundation, Inc., 16 16 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 17 17 * 18 18 **************************************************************************/
+1 -1
drivers/staging/gma500/psb_intel_bios.h
··· 11 11 * more details. 12 12 * 13 13 * You should have received a copy of the GNU General Public License along with 14 - * this program; if not, write to the Free Software Foundation, Inc., 14 + * this program; if not, write to the Free Software Foundation, Inc., 15 15 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 16 16 * 17 17 * Authors:
+2 -2
drivers/staging/gma500/psb_intel_display.h
··· 1 1 /* copyright (c) 2008, Intel Corporation 2 - * 2 + * 3 3 * This program is free software; you can redistribute it and/or modify it 4 4 * under the terms and conditions of the GNU General Public License, 5 5 * version 2, as published by the Free Software Foundation. ··· 10 10 * more details. 11 11 * 12 12 * You should have received a copy of the GNU General Public License along with 13 - * this program; if not, write to the Free Software Foundation, Inc., 13 + * this program; if not, write to the Free Software Foundation, Inc., 14 14 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 15 15 * 16 16 * Authors:
+1 -1
drivers/staging/gma500/psb_intel_drv.h
··· 11 11 * more details. 12 12 * 13 13 * You should have received a copy of the GNU General Public License along with 14 - * this program; if not, write to the Free Software Foundation, Inc., 14 + * this program; if not, write to the Free Software Foundation, Inc., 15 15 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 16 16 * 17 17 */
+11 -11
drivers/staging/gma500/psb_intel_reg.h
··· 1 1 /* 2 2 * Copyright (c) 2009, Intel Corporation. 3 - * 3 + * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms and conditions of the GNU General Public License, 6 6 * version 2, as published by the Free Software Foundation. ··· 11 11 * more details. 12 12 * 13 13 * You should have received a copy of the GNU General Public License along with 14 - * this program; if not, write to the Free Software Foundation, Inc., 14 + * this program; if not, write to the Free Software Foundation, Inc., 15 15 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 16 16 */ 17 17 #ifndef __PSB_INTEL_REG_H__ ··· 589 589 /* 590 590 * Some BIOS scratch area registers. The 845 (and 830?) store the amount 591 591 * of video memory available to the BIOS in SWF1. 592 - */ 592 + */ 593 593 #define SWF0 0x71410 594 594 #define SWF1 0x71414 595 595 #define SWF2 0x71418 ··· 695 695 */ 696 696 #define MRST_DPLL_A 0x0f014 697 697 #define MDFLD_DPLL_B 0x0f018 698 - #define MDFLD_INPUT_REF_SEL (1 << 14) 699 - #define MDFLD_VCO_SEL (1 << 16) 698 + #define MDFLD_INPUT_REF_SEL (1 << 14) 699 + #define MDFLD_VCO_SEL (1 << 16) 700 700 #define DPLLA_MODE_LVDS (2 << 26) /* mrst */ 701 - #define MDFLD_PLL_LATCHEN (1 << 28) 702 - #define MDFLD_PWR_GATE_EN (1 << 30) 703 - #define MDFLD_P1_MASK (0x1FF << 17) 701 + #define MDFLD_PLL_LATCHEN (1 << 28) 702 + #define MDFLD_PWR_GATE_EN (1 << 30) 703 + #define MDFLD_P1_MASK (0x1FF << 17) 704 704 #define MRST_FPA0 0x0f040 705 705 #define MRST_FPA1 0x0f044 706 706 #define MDFLD_DPLL_DIV0 0x0f048 ··· 1094 1094 #define DCS_PIXEL_FORMAT_3bbp 0x1 1095 1095 #define DCS_PIXEL_FORMAT_8bbp 0x2 1096 1096 #define DCS_PIXEL_FORMAT_12bbp 0x3 1097 - #define DCS_PIXEL_FORMAT_16bbp 0x5 1098 - #define DCS_PIXEL_FORMAT_18bbp 0x6 1097 + #define DCS_PIXEL_FORMAT_16bbp 0x5 1098 + #define DCS_PIXEL_FORMAT_18bbp 0x6 1099 1099 #define DCS_PIXEL_FORMAT_24bbp 0x7 1100 1100 #define write_mem_cont 0x3c 1101 1101 /* ************************************************************************* *\ ··· 1190 1190 * byte alignment 1191 1191 */ 1192 1192 #define DBI_CB_TIME_OUT 0xFFFF 1193 - #define GEN_FB_TIME_OUT 2000 1193 + #define GEN_FB_TIME_OUT 2000 1194 1194 #define ALIGNMENT_32BYTE_MASK (~(BIT0|BIT1|BIT2|BIT3|BIT4)) 1195 1195 #define SKU_83 0x01 1196 1196 #define SKU_100 0x02
+2 -2
drivers/staging/gma500/psb_intel_sdvo_regs.h
··· 1 1 /* 2 2 * SDVO command definitions and structures. 3 - * 3 + * 4 4 * Copyright (c) 2008, Intel Corporation 5 5 * 6 6 * This program is free software; you can redistribute it and/or modify it ··· 13 13 * more details. 14 14 * 15 15 * You should have received a copy of the GNU General Public License along with 16 - * this program; if not, write to the Free Software Foundation, Inc., 16 + * this program; if not, write to the Free Software Foundation, Inc., 17 17 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 18 18 * 19 19 * Authors:
+15 -15
drivers/staging/gma500/psb_powermgmt.c
··· 119 119 crtc->funcs->save(crtc); 120 120 } 121 121 } 122 - 122 + 123 123 list_for_each_entry(connector, &dev->mode_config.connector_list, head) { 124 124 connector->funcs->save(connector); 125 125 } ··· 194 194 return; 195 195 196 196 save_display_registers(dev); 197 - 197 + 198 198 if (dev_priv->iLVDS_enable) { 199 199 /*shutdown the panel*/ 200 200 PSB_WVDC32(0, PP_CONTROL); ··· 243 243 struct psb_gtt *pg = dev_priv->pg; 244 244 245 245 printk(KERN_ALERT "%s \n", __func__); 246 - 246 + 247 247 #ifdef OSPM_GFX_DPK 248 248 printk(KERN_ALERT "%s \n", __func__); 249 249 #endif ··· 263 263 * above. 264 264 */ 265 265 /*psb_gtt_init(dev_priv->pg, 1);*/ 266 - 266 + 267 267 restore_display_registers(dev); 268 268 } 269 269 ··· 356 356 int videoenc_access_count; 357 357 int videodec_access_count; 358 358 int display_access_count; 359 - bool suspend_pci = true; 359 + bool suspend_pci = true; 360 360 361 361 if(gbSuspendInProgress || gbResumeInProgress) 362 362 { ··· 518 518 519 519 if (islands & OSPM_DISPLAY_ISLAND) { 520 520 pwr_mask = PSB_PWRGT_DISPLAY_MASK; 521 - 521 + 522 522 outl(pwr_mask, (dev_priv->ospm_base + PSB_PM_SSC)); 523 523 524 524 while (true) { ··· 529 529 udelay(10); 530 530 } 531 531 } 532 - #endif 532 + #endif 533 533 } 534 534 535 535 ··· 553 553 * specified island's hw so don't power it off. If force_on is true, 554 554 * this will power on the specified island if it is off. 555 555 * Otherwise, this will return false and the caller is expected to not 556 - * access the hw. 557 - * 558 - * NOTE *** If this is called from and interrupt handler or other atomic 556 + * access the hw. 557 + * 558 + * NOTE *** If this is called from and interrupt handler or other atomic 559 559 * context, then it will return false if we are in the middle of a 560 560 * power state transition and the caller will be expected to handle that 561 561 * even if force_on is set to true. ··· 563 563 bool ospm_power_using_hw_begin(int hw_island, UHBUsage usage) 564 564 { 565 565 return 1; /*FIXMEAC */ 566 - #if 0 566 + #if 0 567 567 bool ret = true; 568 568 bool island_is_off = false; 569 569 bool b_atomic = (in_interrupt() || in_atomic()); ··· 702 702 mutex_unlock(&power_mutex); 703 703 704 704 return ret; 705 - #endif 705 + #endif 706 706 } 707 707 708 708 ··· 739 739 WARN_ON(atomic_read(&g_videoenc_access_count) < 0); 740 740 WARN_ON(atomic_read(&g_videodec_access_count) < 0); 741 741 WARN_ON(atomic_read(&g_display_access_count) < 0); 742 - #endif 742 + #endif 743 743 } 744 744 745 745 int ospm_runtime_pm_allow(struct drm_device * dev) ··· 750 750 void ospm_runtime_pm_forbid(struct drm_device * dev) 751 751 { 752 752 struct drm_psb_private * dev_priv = dev->dev_private; 753 - 753 + 754 754 DRM_INFO("%s\n", __FUNCTION__); 755 - 755 + 756 756 pm_runtime_forbid(&dev->pdev->dev); 757 757 dev_priv->rpm_enabled = 0; 758 758 }
+1 -1
drivers/staging/gma500/psb_pvr_glue.h
··· 11 11 * more details. 12 12 * 13 13 * You should have received a copy of the GNU General Public License along with 14 - * this program; if not, write to the Free Software Foundation, Inc., 14 + * this program; if not, write to the Free Software Foundation, Inc., 15 15 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 16 16 * 17 17 */
+6 -6
drivers/staging/gma500/psb_reg.h
··· 14 14 * more details. 15 15 * 16 16 * You should have received a copy of the GNU General Public License along with 17 - * this program; if not, write to the Free Software Foundation, Inc., 17 + * this program; if not, write to the Free Software Foundation, Inc., 18 18 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.. 19 19 * 20 20 **************************************************************************/ ··· 568 568 #define PSB_PM_SSC 0x20 569 569 #define PSB_PM_SSS 0x30 570 570 #define PSB_PWRGT_DISPLAY_MASK 0xc /*on a different BA than video/gfx*/ 571 - #define MDFLD_PWRGT_DISPLAY_A_CNTR 0x0000000c 572 - #define MDFLD_PWRGT_DISPLAY_B_CNTR 0x0000c000 573 - #define MDFLD_PWRGT_DISPLAY_C_CNTR 0x00030000 574 - #define MDFLD_PWRGT_DISP_MIPI_CNTR 0x000c0000 571 + #define MDFLD_PWRGT_DISPLAY_A_CNTR 0x0000000c 572 + #define MDFLD_PWRGT_DISPLAY_B_CNTR 0x0000c000 573 + #define MDFLD_PWRGT_DISPLAY_C_CNTR 0x00030000 574 + #define MDFLD_PWRGT_DISP_MIPI_CNTR 0x000c0000 575 575 #define MDFLD_PWRGT_DISPLAY_CNTR (MDFLD_PWRGT_DISPLAY_A_CNTR | MDFLD_PWRGT_DISPLAY_B_CNTR | MDFLD_PWRGT_DISPLAY_C_CNTR | MDFLD_PWRGT_DISP_MIPI_CNTR)// 0x000fc00c 576 576 // Display SSS register bits are different in A0 vs. B0 577 577 #define PSB_PWRGT_GFX_MASK 0x3 ··· 582 582 #define MDFLD_PWRGT_DISPLAY_A_STS_B0 0x0000000c 583 583 #define MDFLD_PWRGT_DISPLAY_B_STS_B0 0x0000c000 584 584 #define MDFLD_PWRGT_DISPLAY_C_STS_B0 0x00030000 585 - #define MDFLD_PWRGT_DISP_MIPI_STS 0x000c0000 585 + #define MDFLD_PWRGT_DISP_MIPI_STS 0x000c0000 586 586 #define MDFLD_PWRGT_DISPLAY_STS_A0 (MDFLD_PWRGT_DISPLAY_A_STS | MDFLD_PWRGT_DISPLAY_B_STS | MDFLD_PWRGT_DISPLAY_C_STS | MDFLD_PWRGT_DISP_MIPI_STS)// 0x000fc00c 587 587 #define MDFLD_PWRGT_DISPLAY_STS_B0 (MDFLD_PWRGT_DISPLAY_A_STS_B0 | MDFLD_PWRGT_DISPLAY_B_STS_B0 | MDFLD_PWRGT_DISPLAY_C_STS_B0 | MDFLD_PWRGT_DISP_MIPI_STS)// 0x000fc00c 588 588 #endif
+1 -1
drivers/staging/gma500/psb_sgx.h
··· 11 11 * more details. 12 12 * 13 13 * You should have received a copy of the GNU General Public License along with 14 - * this program; if not, write to the Free Software Foundation, Inc., 14 + * this program; if not, write to the Free Software Foundation, Inc., 15 15 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 16 16 * 17 17 * Authors:
+1 -1
drivers/staging/gma500/psb_ttm_fence_api.h
··· 15 15 * more details. 16 16 * 17 17 * You should have received a copy of the GNU General Public License along with 18 - * this program; if not, write to the Free Software Foundation, Inc., 18 + * this program; if not, write to the Free Software Foundation, Inc., 19 19 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 20 20 * 21 21 **************************************************************************/
+1 -1
drivers/staging/gma500/psb_ttm_fence_driver.h
··· 15 15 * more details. 16 16 * 17 17 * You should have received a copy of the GNU General Public License along with 18 - * this program; if not, write to the Free Software Foundation, Inc., 18 + * this program; if not, write to the Free Software Foundation, Inc., 19 19 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 20 20 * 21 21 **************************************************************************/
+1 -1
drivers/staging/gma500/psb_ttm_fence_user.h
··· 15 15 * more details. 16 16 * 17 17 * You should have received a copy of the GNU General Public License along with 18 - * this program; if not, write to the Free Software Foundation, Inc., 18 + * this program; if not, write to the Free Software Foundation, Inc., 19 19 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 20 20 * 21 21 **************************************************************************/
+1 -1
drivers/staging/gma500/psb_ttm_placement_user.h
··· 15 15 * more details. 16 16 * 17 17 * You should have received a copy of the GNU General Public License along with 18 - * this program; if not, write to the Free Software Foundation, Inc., 18 + * this program; if not, write to the Free Software Foundation, Inc., 19 19 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 20 20 * 21 21 **************************************************************************/
+1 -1
drivers/staging/gma500/psb_ttm_userobj_api.h
··· 15 15 * more details. 16 16 * 17 17 * You should have received a copy of the GNU General Public License along with 18 - * this program; if not, write to the Free Software Foundation, Inc., 18 + * this program; if not, write to the Free Software Foundation, Inc., 19 19 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. 20 20 * 21 21 **************************************************************************/