staging: sm750fb: Edit CamelCase in ddk750_mode files
Subsystems (2)
PATCH v2 1/1 staging: sm750fb: Edit CamelCase in ddk750_mode files
Edit CamelCase naming in ddk750 files and
in dependent file sm750_hw.c.
Remove hungrarian notation prefixes in ddk750_mode.c file.
---
Changes in v2:
- Remove hungarion notation prefixes in ddk750_mode.c file
--- drivers/staging/sm750fb/ddk750_mode.c | 86 +++++++++++++-------------- drivers/staging/sm750fb/ddk750_mode.h | 2 +- drivers/staging/sm750fb/sm750_hw.c | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-)
drivers/staging/sm750fb/ddk750_mode.c +43 -43
@@ -14,13 +14,13 @@* in bit 29:27 of Display Control register. */ static unsigned long -displayControlAdjust_SM750LE (struct mode_parameter *pModeParam, -unsigned long dispControl) +display_control_adjust_SM750LE (struct mode_parameter *mode_param, +unsigned long disp_control) {unsigned long x, y; - x = pModeParam->horizontal_display_end; - y = pModeParam->vertical_display_end; + x = mode_param->horizontal_display_end; + y = mode_param->vertical_display_end;/* * SM750LE has to set up the top-left and bottom-right
@@ -42,41 +42,41 @@ displayControlAdjust_SM750LE(struct mode_parameter *pModeParam,*/ /* Clear bit 29:27 of display control register */ - dispControl &= ~CRT_DISPLAY_CTRL_CLK_MASK ; + disp_control &= ~CRT_DISPLAY_CTRL_CLK_MASK ;/* Set bit 29:27 of display control register for the right clock */ /* Note that SM750LE only need to supported 7 resolutions. */ if (x ==800 && y ==600 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL41 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL41 ;else if (x ==1024 && y ==768 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL65 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL65 ;else if (x ==1152 && y ==864 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL80 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL80 ;else if (x ==1280 && y ==768 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL80 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL80 ;else if (x ==1280 && y ==720 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL74 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL74 ;else if (x ==1280 && y ==960 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL108 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL108 ;else if (x ==1280 && y ==1024 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL108 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL108 ;else /* default to VGA clock */ - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL25 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL25 ;/* Set bit 25:24 of display controller */ - dispControl |= (CRT_DISPLAY_CTRL_CRTSELECT |CRT_DISPLAY_CTRL_RGBBIT ); + disp_control |= (CRT_DISPLAY_CTRL_CRTSELECT |CRT_DISPLAY_CTRL_RGBBIT );/* Set bit 14 of display controller */ - dispControl |=DISPLAY_CTRL_CLOCK_PHASE ; + disp_control |=DISPLAY_CTRL_CLOCK_PHASE ; -poke32 (CRT_DISPLAY_CTRL , dispControl); +poke32 (CRT_DISPLAY_CTRL , disp_control); -return dispControl; +return disp_control; }/* only timing related registers will be programed */ -static int programModeRegisters (struct mode_parameter *pModeParam, -struct pll_value *pll) +static int program_mode_registers (struct mode_parameter *mode_param, +struct pll_value *pll) {int ret =0 ;int cnt =0 ;
@@ -86,46 +86,46 @@ static int programModeRegisters(struct mode_parameter *pModeParam,/* programe secondary pixel clock */ poke32 (CRT_PLL_CTRL ,sm750_format_pll_reg (pll)); - tmp = ((pModeParam->horizontal_total -1 ) << + tmp = ((mode_param->horizontal_total -1 ) <<CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT ) &CRT_HORIZONTAL_TOTAL_TOTAL_MASK ; - tmp |= (pModeParam->horizontal_display_end -1 ) & + tmp |= (mode_param->horizontal_display_end -1 ) &CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK ;poke32 (CRT_HORIZONTAL_TOTAL , tmp); - tmp = (pModeParam->horizontal_sync_width << + tmp = (mode_param->horizontal_sync_width <<CRT_HORIZONTAL_SYNC_WIDTH_SHIFT ) &CRT_HORIZONTAL_SYNC_WIDTH_MASK ; - tmp |= (pModeParam->horizontal_sync_start -1 ) & + tmp |= (mode_param->horizontal_sync_start -1 ) &CRT_HORIZONTAL_SYNC_START_MASK ;poke32 (CRT_HORIZONTAL_SYNC , tmp); - tmp = ((pModeParam->vertical_total -1 ) << + tmp = ((mode_param->vertical_total -1 ) <<CRT_VERTICAL_TOTAL_TOTAL_SHIFT ) &CRT_VERTICAL_TOTAL_TOTAL_MASK ; - tmp |= (pModeParam->vertical_display_end -1 ) & + tmp |= (mode_param->vertical_display_end -1 ) &CRT_VERTICAL_TOTAL_DISPLAY_END_MASK ;poke32 (CRT_VERTICAL_TOTAL , tmp); - tmp = ((pModeParam->vertical_sync_height << + tmp = ((mode_param->vertical_sync_height <<CRT_VERTICAL_SYNC_HEIGHT_SHIFT )) &CRT_VERTICAL_SYNC_HEIGHT_MASK ; - tmp |= (pModeParam->vertical_sync_start -1 ) & + tmp |= (mode_param->vertical_sync_start -1 ) &CRT_VERTICAL_SYNC_START_MASK ;poke32 (CRT_VERTICAL_SYNC , tmp); tmp =DISPLAY_CTRL_TIMING |DISPLAY_CTRL_PLANE ; -if (pModeParam->vertical_sync_polarity) +if (mode_param->vertical_sync_polarity) tmp |=DISPLAY_CTRL_VSYNC_PHASE ; -if (pModeParam->horizontal_sync_polarity) +if (mode_param->horizontal_sync_polarity) tmp |=DISPLAY_CTRL_HSYNC_PHASE ;if (sm750_get_chip_type () ==SM750LE ) { -displayControlAdjust_SM750LE (pModeParam, tmp); +display_control_adjust_SM750LE (mode_param, tmp); }else { reg = peek32(CRT_DISPLAY_CTRL) & ~(DISPLAY_CTRL_VSYNC_PHASE |
@@ -140,40 +140,40 @@ static int programModeRegisters(struct mode_parameter *pModeParam,poke32 (PANEL_PLL_CTRL ,sm750_format_pll_reg (pll)); - reg = ((pModeParam->horizontal_total -1 ) << + reg = ((mode_param->horizontal_total -1 ) <<PANEL_HORIZONTAL_TOTAL_TOTAL_SHIFT ) &PANEL_HORIZONTAL_TOTAL_TOTAL_MASK ; - reg |= ((pModeParam->horizontal_display_end -1 ) & + reg |= ((mode_param->horizontal_display_end -1 ) &PANEL_HORIZONTAL_TOTAL_DISPLAY_END_MASK );poke32 (PANEL_HORIZONTAL_TOTAL , reg);poke32 (PANEL_HORIZONTAL_SYNC , - ((pModeParam->horizontal_sync_width << + ((mode_param->horizontal_sync_width <<PANEL_HORIZONTAL_SYNC_WIDTH_SHIFT ) &PANEL_HORIZONTAL_SYNC_WIDTH_MASK ) | - ((pModeParam->horizontal_sync_start -1 ) & + ((mode_param->horizontal_sync_start -1 ) &PANEL_HORIZONTAL_SYNC_START_MASK ));poke32 (PANEL_VERTICAL_TOTAL , - (((pModeParam->vertical_total -1 ) << + (((mode_param->vertical_total -1 ) <<PANEL_VERTICAL_TOTAL_TOTAL_SHIFT ) &PANEL_VERTICAL_TOTAL_TOTAL_MASK ) | - ((pModeParam->vertical_display_end -1 ) & + ((mode_param->vertical_display_end -1 ) &PANEL_VERTICAL_TOTAL_DISPLAY_END_MASK ));poke32 (PANEL_VERTICAL_SYNC , - ((pModeParam->vertical_sync_height << + ((mode_param->vertical_sync_height <<PANEL_VERTICAL_SYNC_HEIGHT_SHIFT ) &PANEL_VERTICAL_SYNC_HEIGHT_MASK ) | - ((pModeParam->vertical_sync_start -1 ) & + ((mode_param->vertical_sync_start -1 ) &PANEL_VERTICAL_SYNC_START_MASK )); tmp =DISPLAY_CTRL_TIMING |DISPLAY_CTRL_PLANE ; -if (pModeParam->vertical_sync_polarity) +if (mode_param->vertical_sync_polarity) tmp |=DISPLAY_CTRL_VSYNC_PHASE ; -if (pModeParam->horizontal_sync_polarity) +if (mode_param->horizontal_sync_polarity) tmp |=DISPLAY_CTRL_HSYNC_PHASE ; -if (pModeParam->clock_phase_polarity) +if (mode_param->clock_phase_polarity) tmp |=DISPLAY_CTRL_CLOCK_PHASE ; reserved = PANEL_DISPLAY_CTRL_RESERVED_MASK |
@@ -207,7 +207,7 @@ static int programModeRegisters(struct mode_parameter *pModeParam,return ret; } -int ddk750_setModeTiming (struct mode_parameter *parm,enum clock_type clock) +int ddk750_set_mode_timing (struct mode_parameter *parm,enum clock_type clock) {struct pll_value pll;
@@ -220,6 +220,6 @@ int ddk750_setModeTiming(struct mode_parameter *parm, enum clock_type clock)outb_p (0x88 ,0x3d4 );outb_p (0x06 ,0x3d5 ); } -programModeRegisters (parm, &pll); +program_mode_registers (parm, &pll);return 0 ; }
drivers/staging/sm750fb/ddk750_mode.h +1 -1
@@ -33,5 +33,5 @@ struct mode_parameter { enum spolarity clock_phase_polarity; }; -int ddk750_setModeTiming (struct mode_parameter *parm,enum clock_type clock); +int ddk750_set_mode_timing (struct mode_parameter *parm,enum clock_type clock);#endif
drivers/staging/sm750fb/sm750_hw.c +1 -1
@@ -305,7 +305,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc, clock =SECONDARY_PLL ;pr_debug ("Request pixel clock = %lu\n" , modparm.pixel_clock); - ret =ddk750_setModeTiming (&modparm, clock); + ret =ddk750_set_mode_timing (&modparm, clock);if (ret) {pr_err ("Set mode timing failed\n" ); goto exit;
Signature · 1 line
2.17.1
Quoted 6 lines · Jamal Shareef
Edit CamelCase naming in ddk750 files and
in dependent filesm750_hw.c.Remove hungrarian notation prefixes in
ddk750_mode.cfile.Signed-off-by Jamal Shareef <[email protected]>
Quoted 247 lines
---
Changes in v2:
- Remove hungarion notation prefixes inddk750_mode.cfile--- drivers/staging/sm750fb/ddk750_mode.c | 86 +++++++++++++-------------- drivers/staging/sm750fb/ddk750_mode.h | 2 +- drivers/staging/sm750fb/sm750_hw.c | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-)drivers/staging/sm750fb/ddk750_mode.c +43
-43@@ -14,13 +14,13 @@* in bit 29:27 of Display Control register. */ static unsigned long -displayControlAdjust_SM750LE (struct mode_parameter *pModeParam, -unsigned long dispControl) +display_control_adjust_SM750LE (struct mode_parameter *mode_param, +unsigned long disp_control) {unsigned long x, y; - x = pModeParam->horizontal_display_end; - y = pModeParam->vertical_display_end; + x = mode_param->horizontal_display_end; + y = mode_param->vertical_display_end;/* * SM750LE has to set up the top-left and bottom-right @@ -42,41 +42,41 @@ displayControlAdjust_SM750LE(struct mode_parameter *pModeParam,*/ /* Clear bit 29:27 of display control register */ - dispControl &= ~CRT_DISPLAY_CTRL_CLK_MASK ; + disp_control &= ~CRT_DISPLAY_CTRL_CLK_MASK ;/* Set bit 29:27 of display control register for the right clock */ /* Note that SM750LE only need to supported 7 resolutions. */ if (x ==800 && y ==600 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL41 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL41 ;else if (x ==1024 && y ==768 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL65 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL65 ;else if (x ==1152 && y ==864 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL80 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL80 ;else if (x ==1280 && y ==768 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL80 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL80 ;else if (x ==1280 && y ==720 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL74 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL74 ;else if (x ==1280 && y ==960 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL108 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL108 ;else if (x ==1280 && y ==1024 ) - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL108 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL108 ;else /* default to VGA clock */ - dispControl |=CRT_DISPLAY_CTRL_CLK_PLL25 ; + disp_control |=CRT_DISPLAY_CTRL_CLK_PLL25 ;/* Set bit 25:24 of display controller */ - dispControl |= (CRT_DISPLAY_CTRL_CRTSELECT |CRT_DISPLAY_CTRL_RGBBIT ); + disp_control |= (CRT_DISPLAY_CTRL_CRTSELECT |CRT_DISPLAY_CTRL_RGBBIT );/* Set bit 14 of display controller */ - dispControl |=DISPLAY_CTRL_CLOCK_PHASE ; + disp_control |=DISPLAY_CTRL_CLOCK_PHASE ; -poke32 (CRT_DISPLAY_CTRL , dispControl); +poke32 (CRT_DISPLAY_CTRL , disp_control); -return dispControl; +return disp_control; }/* only timing related registers will be programed */ -static int programModeRegisters (struct mode_parameter *pModeParam, -struct pll_value *pll) +static int program_mode_registers (struct mode_parameter *mode_param, +struct pll_value *pll) {int ret =0 ;int cnt =0 ;@@ -86,46 +86,46 @@ static int programModeRegisters(struct mode_parameter *pModeParam,/* programe secondary pixel clock */ poke32 (CRT_PLL_CTRL ,sm750_format_pll_reg (pll)); - tmp = ((pModeParam->horizontal_total -1 ) << + tmp = ((mode_param->horizontal_total -1 ) <<CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT ) &CRT_HORIZONTAL_TOTAL_TOTAL_MASK ; - tmp |= (pModeParam->horizontal_display_end -1 ) & + tmp |= (mode_param->horizontal_display_end -1 ) &CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK ;poke32 (CRT_HORIZONTAL_TOTAL , tmp); - tmp = (pModeParam->horizontal_sync_width << + tmp = (mode_param->horizontal_sync_width <<CRT_HORIZONTAL_SYNC_WIDTH_SHIFT ) &CRT_HORIZONTAL_SYNC_WIDTH_MASK ; - tmp |= (pModeParam->horizontal_sync_start -1 ) & + tmp |= (mode_param->horizontal_sync_start -1 ) &CRT_HORIZONTAL_SYNC_START_MASK ;poke32 (CRT_HORIZONTAL_SYNC , tmp); - tmp = ((pModeParam->vertical_total -1 ) << + tmp = ((mode_param->vertical_total -1 ) <<CRT_VERTICAL_TOTAL_TOTAL_SHIFT ) &CRT_VERTICAL_TOTAL_TOTAL_MASK ; - tmp |= (pModeParam->vertical_display_end -1 ) & + tmp |= (mode_param->vertical_display_end -1 ) &CRT_VERTICAL_TOTAL_DISPLAY_END_MASK ;poke32 (CRT_VERTICAL_TOTAL , tmp); - tmp = ((pModeParam->vertical_sync_height << + tmp = ((mode_param->vertical_sync_height <<CRT_VERTICAL_SYNC_HEIGHT_SHIFT )) &CRT_VERTICAL_SYNC_HEIGHT_MASK ; - tmp |= (pModeParam->vertical_sync_start -1 ) & + tmp |= (mode_param->vertical_sync_start -1 ) &CRT_VERTICAL_SYNC_START_MASK ;poke32 (CRT_VERTICAL_SYNC , tmp); tmp =DISPLAY_CTRL_TIMING |DISPLAY_CTRL_PLANE ; -if (pModeParam->vertical_sync_polarity) +if (mode_param->vertical_sync_polarity) tmp |=DISPLAY_CTRL_VSYNC_PHASE ; -if (pModeParam->horizontal_sync_polarity) +if (mode_param->horizontal_sync_polarity) tmp |=DISPLAY_CTRL_HSYNC_PHASE ;if (sm750_get_chip_type () ==SM750LE ) { -displayControlAdjust_SM750LE (pModeParam, tmp); +display_control_adjust_SM750LE (mode_param, tmp); }else { reg = peek32(CRT_DISPLAY_CTRL) & ~(DISPLAY_CTRL_VSYNC_PHASE |@@ -140,40 +140,40 @@ static int programModeRegisters(struct mode_parameter *pModeParam,poke32 (PANEL_PLL_CTRL ,sm750_format_pll_reg (pll)); - reg = ((pModeParam->horizontal_total -1 ) << + reg = ((mode_param->horizontal_total -1 ) <<PANEL_HORIZONTAL_TOTAL_TOTAL_SHIFT ) &PANEL_HORIZONTAL_TOTAL_TOTAL_MASK ; - reg |= ((pModeParam->horizontal_display_end -1 ) & + reg |= ((mode_param->horizontal_display_end -1 ) &PANEL_HORIZONTAL_TOTAL_DISPLAY_END_MASK );poke32 (PANEL_HORIZONTAL_TOTAL , reg);poke32 (PANEL_HORIZONTAL_SYNC , - ((pModeParam->horizontal_sync_width << + ((mode_param->horizontal_sync_width <<PANEL_HORIZONTAL_SYNC_WIDTH_SHIFT ) &PANEL_HORIZONTAL_SYNC_WIDTH_MASK ) | - ((pModeParam->horizontal_sync_start -1 ) & + ((mode_param->horizontal_sync_start -1 ) &PANEL_HORIZONTAL_SYNC_START_MASK ));poke32 (PANEL_VERTICAL_TOTAL , - (((pModeParam->vertical_total -1 ) << + (((mode_param->vertical_total -1 ) <<PANEL_VERTICAL_TOTAL_TOTAL_SHIFT ) &PANEL_VERTICAL_TOTAL_TOTAL_MASK ) | - ((pModeParam->vertical_display_end -1 ) & + ((mode_param->vertical_display_end -1 ) &PANEL_VERTICAL_TOTAL_DISPLAY_END_MASK ));poke32 (PANEL_VERTICAL_SYNC , - ((pModeParam->vertical_sync_height << + ((mode_param->vertical_sync_height <<PANEL_VERTICAL_SYNC_HEIGHT_SHIFT ) &PANEL_VERTICAL_SYNC_HEIGHT_MASK ) | - ((pModeParam->vertical_sync_start -1 ) & + ((mode_param->vertical_sync_start -1 ) &PANEL_VERTICAL_SYNC_START_MASK )); tmp =DISPLAY_CTRL_TIMING |DISPLAY_CTRL_PLANE ; -if (pModeParam->vertical_sync_polarity) +if (mode_param->vertical_sync_polarity) tmp |=DISPLAY_CTRL_VSYNC_PHASE ; -if (pModeParam->horizontal_sync_polarity) +if (mode_param->horizontal_sync_polarity) tmp |=DISPLAY_CTRL_HSYNC_PHASE ; -if (pModeParam->clock_phase_polarity) +if (mode_param->clock_phase_polarity) tmp |=DISPLAY_CTRL_CLOCK_PHASE ; reserved = PANEL_DISPLAY_CTRL_RESERVED_MASK |@@ -207,7 +207,7 @@ static int programModeRegisters(struct mode_parameter *pModeParam,return ret; } -int ddk750_setModeTiming (struct mode_parameter *parm,enum clock_type clock) +int ddk750_set_mode_timing (struct mode_parameter *parm,enum clock_type clock) {struct pll_value pll;@@ -220,6 +220,6 @@ int ddk750_setModeTiming(struct mode_parameter *parm, enum clock_type clock)outb_p (0x88 ,0x3d4 );outb_p (0x06 ,0x3d5 ); } -programModeRegisters (parm, &pll); +program_mode_registers (parm, &pll);return 0 ; }drivers/staging/sm750fb/ddk750_mode.h +1
-1@@ -33,5 +33,5 @@ struct mode_parameter { enum spolarity clock_phase_polarity; }; -int ddk750_setModeTiming (struct mode_parameter *parm,enum clock_type clock); +int ddk750_set_mode_timing (struct mode_parameter *parm,enum clock_type clock);#endif drivers/staging/sm750fb/sm750_hw.c +1
-2@@ -305,7 +305,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc, clock =SECONDARY_PLL ;pr_debug ("Request pixel clock = %lu\n" , modparm.pixel_clock); - ret =ddk750_setModeTiming (&modparm, clock); + ret =ddk750_set_mode_timing (&modparm, clock);if (ret) {pr_err ("Set mode timing failed\n" ); goto exit; --2.17.1
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20191017201220.27728-1-jamal.k.shareef%40gmail.com.