sm750fb: Question about dviInit from ddk750_dvi.(c|h)
I was working on some checkpatch fixes for ddk750_dvi.h and ddk750_dvi.c when I noticed that dviInit function does not seem to be invoked in any of the files that belong to this driver and can be removed. Am I missing something? Thank you, Pavle
Re: [PATCH v2 00/49] *** SUBJECT HERE ***
On Wed, Apr 07, 2021 at 10:32:53AM +0200, Greg KH wrote: > On Wed, Apr 07, 2021 at 09:32:29AM +0200, Greg KH wrote: > > On Wed, Apr 07, 2021 at 12:15:22AM -0700, Pavle Rohalj wrote: > > > On Wed, Apr 07, 2021 at 09:08:07AM +0200, Greg KH wrote: > > > > On Tue, Apr 06, 2021 at 11:35:54PM -0700, Pavle Rohalj wrote: > > > > > Changes in v2: > > > > > - Removed type information from variable names > > > > > - Broken up the changes into smaller patches > > > > > > > > Your subject is very odd :( > > > > > > Sorry about that, I overlooked the fact that I reran format-patch. The > > > subject should be: > > > > > > [PATCH] staging: sm750fb: Convert camel case to snake case > > > > > > Should I resubmit? > > > > Not yet, let me review these first, I think they might need some work... > > > > Ok, now you can fix them up, I stopped after reviewing patch 02/49, > these need some work. > > thanks, > > greg k-h Will do. Thank you. -Pavle
Re: [PATCH v2 01/49] staging: sm750fb: Update dvi_ctrl_device to snake case
On Wed, Apr 07, 2021 at 10:31:21AM +0200, Greg KH wrote:
> On Tue, Apr 06, 2021 at 11:35:56PM -0700, Pavle Rohalj wrote:
> > Fix "Avoid CamelCase" checkpatch.pl checks for dvi_ctrl_device structure and
> > its usages.
> >
> > Signed-off-by: Pavle Rohalj
> > ---
> > drivers/staging/sm750fb/ddk750_dvi.c| 30
> > drivers/staging/sm750fb/ddk750_dvi.h| 20 +--
> > drivers/staging/sm750fb/ddk750_sii164.c | 48 -
> > drivers/staging/sm750fb/ddk750_sii164.h | 20 +--
> > 4 files changed, 59 insertions(+), 59 deletions(-)
> >
> > diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
> > b/drivers/staging/sm750fb/ddk750_dvi.c
> > index cd564ea40779..db19bf732482 100644
> > --- a/drivers/staging/sm750fb/ddk750_dvi.c
> > +++ b/drivers/staging/sm750fb/ddk750_dvi.c
> > @@ -11,20 +11,20 @@
> > * function API. Please set the function pointer to NULL whenever the
> > function
> > * is not supported.
> > */
> > -static struct dvi_ctrl_device g_dcftSupportedDviController[] = {
> > +static struct dvi_ctrl_device dcft_supported_dvi_controller[] = {
>
> Why the "dcft_" prefix? We know this is a "dvi control device" by the
> fact that the type says it is :)
>
Didn't catch that--makes sense.
> > #ifdef DVI_CTRL_SII164
> > {
> > - .pfnInit = sii164InitChip,
> > - .pfnGetVendorId = sii164GetVendorID,
> > - .pfnGetDeviceId = sii164GetDeviceID,
> > + .pfn_init = sii164_init_chip,
> > + .pfn_get_vendor_id = sii164_get_vendor_id,
> > + .pfn_get_device_id = sii164_get_device_id,
> > #ifdef SII164_FULL_FUNCTIONS
> > - .pfnResetChip = sii164ResetChip,
> > - .pfnGetChipString = sii164GetChipString,
> > - .pfnSetPower = sii164SetPower,
> > - .pfnEnableHotPlugDetection = sii164EnableHotPlugDetection,
> > - .pfnIsConnected = sii164IsConnected,
> > - .pfnCheckInterrupt = sii164CheckInterrupt,
> > - .pfnClearInterrupt = sii164ClearInterrupt,
> > + .pfn_reset_chip = sii164_reset_chip,
> > + .pfn_get_chip_string = sii164_get_chip_string,
> > + .pfn_set_power = sii164_set_power,
> > + .pfn_enable_hot_plug_detection =
> > sii164_enable_hot_plug_detection,
> > + .pfn_is_connected = sii164_is_connected,
> > + .pfn_check_interrupt = sii164_check_interrupt,
> > + .pfn_clear_interrupt = sii164_clear_interrupt,
> > #endif
> > },
> > #endif
> > @@ -41,11 +41,11 @@ int dviInit(unsigned char edge_select,
> > unsigned char pll_filter_enable,
> > unsigned char pll_filter_value)
> > {
> > - struct dvi_ctrl_device *pCurrentDviCtrl;
> > + struct dvi_ctrl_device *current_dvi_ctrl;
> >
> > - pCurrentDviCtrl = g_dcftSupportedDviController;
> > - if (pCurrentDviCtrl->pfnInit) {
> > - return pCurrentDviCtrl->pfnInit(edge_select,
> > + current_dvi_ctrl = dcft_supported_dvi_controller;
> > + if (current_dvi_ctrl->pfn_init) {
> > + return current_dvi_ctrl->pfn_init(edge_select,
> > bus_select,
> > dual_edge_clk_select,
> > hsync_enable,
> > diff --git a/drivers/staging/sm750fb/ddk750_dvi.h
> > b/drivers/staging/sm750fb/ddk750_dvi.h
> > index 1c7a565b617a..4ca2591ea94b 100644
> > --- a/drivers/staging/sm750fb/ddk750_dvi.h
> > +++ b/drivers/staging/sm750fb/ddk750_dvi.h
> > @@ -27,16 +27,16 @@ typedef void (*PFN_DVICTRL_CLEARINTERRUPT)(void);
> >
> > /* Structure to hold all the function pointer to the DVI Controller. */
> > struct dvi_ctrl_device {
> > - PFN_DVICTRL_INITpfnInit;
> > - PFN_DVICTRL_RESETCHIP pfnResetChip;
> > - PFN_DVICTRL_GETCHIPSTRING pfnGetChipString;
> > - PFN_DVICTRL_GETVENDORID pfnGetVendorId;
> > - PFN_DVICTRL_GETDEVICEID pfnGetDeviceId;
> > - PFN_DVICTRL_SETPOWERpfnSetPower;
> > - PFN_DVICTRL_HOTPLUGDETECTIONpfnEnableHotPlugDetection;
> > - PFN_DVICTRL_ISCONNECTED pfnIsConnected;
> > - PFN_DVICTRL_CHECKINTERRUPT pfnCheckInterrupt;
> > - PFN_DVICTRL_CLEARINTERRUPT pfnClearInterrupt;
> > + PFN_DVICTRL_INITpfn_init;
>
> "pfn_" means "pointer to a function" whic
Re: [PATCH v2 00/49] *** SUBJECT HERE ***
On Wed, Apr 07, 2021 at 09:11:18AM +0200, Fabio Aiuto wrote: > On Tue, Apr 06, 2021 at 11:35:54PM -0700, Pavle Rohalj wrote: > > Changes in v2: > > - Removed type information from variable names > > - Broken up the changes into smaller patches > > Hi Pavle, > > I think you missed the subject in cover letter, but maybe > is not a relevant issue... (Resending this because I realized I did not reply to everyone) Hi Fabio, I did, my bad. This patchset is an attempt to fix checkpatch.pl checks for camel case usage in sm750fb driver. -Pavle
Re: [PATCH v2 08/49] staging: sm750fb: Update enum values in dpms to snake case
On Wed, Apr 07, 2021 at 09:24:07AM +0200, Greg KH wrote:
> On Tue, Apr 06, 2021 at 11:36:16PM -0700, Pavle Rohalj wrote:
> > Fix "Avoid CamelCase" checkpatch.pl checks for values in
> > enum dpms.
> >
> > Signed-off-by: Pavle Rohalj
> > ---
> > drivers/staging/sm750fb/ddk750_power.h | 8
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/sm750fb/ddk750_power.h
> > b/drivers/staging/sm750fb/ddk750_power.h
> > index 7002567a47d2..4756db1ccb9c 100644
> > --- a/drivers/staging/sm750fb/ddk750_power.h
> > +++ b/drivers/staging/sm750fb/ddk750_power.h
> > @@ -3,10 +3,10 @@
> > #define DDK750_POWER_H__
> >
> > enum dpms {
> > - crtDPMS_ON = 0x0,
> > - crtDPMS_STANDBY = 0x1,
> > - crtDPMS_SUSPEND = 0x2,
> > - crtDPMS_OFF = 0x3,
> > + CRT_DPMS_ON = 0x0,
> > + CRT_DPMS_STANDBY = 0x1,
> > + CRT_DPMS_SUSPEND = 0x2,
> > + CRT_DPMS_OFF = 0x3,
> > };
>
> And the build does not break with this change? If so, then why are
> these here at all?
>
> thanks,
>
> greg k-h
I do not think so, I was able to build and load the driver with these
changes. It looks like this enum is used as a type of the state parameter of
ddk750_set_dpms function, but the three defined constants are never referenced.
Should we get rid of dpms enum and change the type of the parameter to an
unsigned integer?
-Pavle
Re: [PATCH v2 00/49] *** SUBJECT HERE ***
On Wed, Apr 07, 2021 at 09:08:07AM +0200, Greg KH wrote: > On Tue, Apr 06, 2021 at 11:35:54PM -0700, Pavle Rohalj wrote: > > Changes in v2: > > - Removed type information from variable names > > - Broken up the changes into smaller patches > > Your subject is very odd :( Sorry about that, I overlooked the fact that I reran format-patch. The subject should be: [PATCH] staging: sm750fb: Convert camel case to snake case Should I resubmit? -Pavle
[PATCH v2 49/49] staging: sm750fb: Update members of sm750_pnltype struct to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the members of
sm750_pnltype structure, in particular sm750_24TFT, sm750_dualTFT,
and sm750_doubleTFT.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 6 +++---
drivers/staging/sm750fb/sm750.h| 6 +++---
drivers/staging/sm750fb/sm750_hw.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 946143de11fc..c9b17d6ac9fb 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -894,11 +894,11 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev,
char *src)
} else if (!strncmp(opt, "nocrt", strlen("nocrt"))) {
sm750_dev->nocrt = 1;
} else if (!strncmp(opt, "36bit", strlen("36bit"))) {
- sm750_dev->pnltype = sm750_doubleTFT;
+ sm750_dev->pnltype = sm750_double_tft;
} else if (!strncmp(opt, "18bit", strlen("18bit"))) {
- sm750_dev->pnltype = sm750_dualTFT;
+ sm750_dev->pnltype = sm750_dual_tft;
} else if (!strncmp(opt, "24bit", strlen("24bit"))) {
- sm750_dev->pnltype = sm750_24TFT;
+ sm750_dev->pnltype = sm750_24_tft;
} else if (!strncmp(opt, "nohwc0", strlen("nohwc0"))) {
g_hwcursor &= ~0x1;
} else if (!strncmp(opt, "nohwc1", strlen("nohwc1"))) {
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 06cf136fa28c..ce02671a1419 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -13,9 +13,9 @@
#endif
enum sm750_pnltype {
- sm750_24TFT = 0,/* 24bit tft */
- sm750_dualTFT = 2, /* dual 18 bit tft */
- sm750_doubleTFT = 1,/* 36 bit double pixel tft */
+ sm750_24_tft = 0, /* 24bit tft */
+ sm750_dual_tft = 2, /* dual 18 bit tft */
+ sm750_double_tft = 1, /* 36 bit double pixel tft */
};
/* vga channel is not concerned */
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index b445f075d0a9..ad81fd5c33ad 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -136,12 +136,12 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct
pci_dev *pdev)
~(PANEL_DISPLAY_CTRL_DUAL_DISPLAY |
PANEL_DISPLAY_CTRL_DOUBLE_PIXEL);
switch (sm750_dev->pnltype) {
- case sm750_24TFT:
+ case sm750_24_tft:
break;
- case sm750_doubleTFT:
+ case sm750_double_tft:
val |= PANEL_DISPLAY_CTRL_DOUBLE_PIXEL;
break;
- case sm750_dualTFT:
+ case sm750_dual_tft:
val |= PANEL_DISPLAY_CTRL_DUAL_DISPLAY;
break;
}
--
2.30.2
[PATCH v2 48/49] staging: sm750fb: Rename fixId to fix_id
Fix "Avoid CamelCase" checkpatch.pl checks for the local variable
fixId in lynxfb_set_fbinfo function.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 0c6bfbedde50..946143de11fc 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -694,7 +694,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int
index)
"kernel HELPERS prepared vesa_modes",
};
- static const char *fixId[2] = {
+ static const char *fix_id[2] = {
"sm750_fb1", "sm750_fb2",
};
@@ -814,7 +814,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int
index)
fix->ywrapstep = crtc->ywrapstep;
fix->accel = FB_ACCEL_SMI;
- strscpy(fix->id, fixId[index], sizeof(fix->id));
+ strscpy(fix->id, fix_id[index], sizeof(fix->id));
fix->smem_start = crtc->o_screen + sm750_dev->vidmem_start;
pr_info("fix->smem_start = %lx\n", fix->smem_start);
--
2.30.2
[PATCH v2 47/49] staging: sm750fb: Rename proc_setBLANK member of lynxfb_output struct
Fix "Avoid CamelCase" checkpatch.pl check for proc_setBLANK member of
lynxfb_output structure.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c | 4 ++--
drivers/staging/sm750fb/sm750.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 937a44530fbf..0c6bfbedde50 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -577,7 +577,7 @@ static int lynxfb_ops_blank(int blank, struct fb_info *info)
pr_debug("blank = %d.\n", blank);
par = info->par;
output = >output;
- return output->proc_setBLANK(output, blank);
+ return output->proc_set_blank(output, blank);
}
static int sm750fb_set_drv(struct lynxfb_par *par)
@@ -605,7 +605,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
crtc->ypanstep = 1;
crtc->ywrapstep = 0;
- output->proc_setBLANK = (sm750_dev->revid == SM750LE_REVISION_ID) ?
+ output->proc_set_blank = (sm750_dev->revid == SM750LE_REVISION_ID) ?
hw_sm750le_set_blank : hw_sm750_set_blank;
/* chip specific phase */
sm750_dev->accel.de_wait = (sm750_dev->revid == SM750LE_REVISION_ID) ?
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 2e6481809d43..06cf136fa28c 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -170,7 +170,7 @@ struct lynxfb_output {
*/
void *priv;
- int (*proc_setBLANK)(struct lynxfb_output *output, int blank);
+ int (*proc_set_blank)(struct lynxfb_output *output, int blank);
};
struct lynxfb_par {
--
2.30.2
[PATCH v2 45/49] staging: sm750fb: Rename sii164_set_power function parameter
Fix "Avoid CamelCase" checkpatch.pl checks for the function parameter powerUp. Signed-off-by: Pavle Rohalj --- drivers/staging/sm750fb/ddk750_sii164.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/sm750fb/ddk750_sii164.h b/drivers/staging/sm750fb/ddk750_sii164.h index ac1431dcb419..a414afbb719a 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.h +++ b/drivers/staging/sm750fb/ddk750_sii164.h @@ -33,7 +33,7 @@ unsigned short sii164_get_device_id(void); #ifdef SII164_FULL_FUNCTIONS void sii164_reset_chip(void); char *sii164_get_chip_string(void); -void sii164_set_power(unsigned char powerUp); +void sii164_set_power(unsigned char power_up); void sii164_enable_hot_plug_detection(unsigned char enable_hot_plug); unsigned char sii164_is_connected(void); unsigned char sii164_check_interrupt(void); -- 2.30.2
[PATCH v2 46/49] staging: sm750fb: Rename local variable Bpp to bpp in sm750.c
Fix "Avoid CamelCase" checkpatch.pl checks for the local variable
Bpp in functions lynxfb_ops_fillrect and lynxfb_ops_copyarea.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 162eaf08db4c..937a44530fbf 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -162,7 +162,7 @@ static void lynxfb_ops_fillrect(struct fb_info *info,
{
struct lynxfb_par *par;
struct sm750_dev *sm750_dev;
- unsigned int base, pitch, Bpp, rop;
+ unsigned int base, pitch, bpp, rop;
u32 color;
if (info->state != FBINFO_STATE_RUNNING)
@@ -177,9 +177,9 @@ static void lynxfb_ops_fillrect(struct fb_info *info,
*/
base = par->crtc.o_screen;
pitch = info->fix.line_length;
- Bpp = info->var.bits_per_pixel >> 3;
+ bpp = info->var.bits_per_pixel >> 3;
- color = (Bpp == 1) ? region->color :
+ color = (bpp == 1) ? region->color :
((u32 *)info->pseudo_palette)[region->color];
rop = (region->rop != ROP_COPY) ? HW_ROP2_XOR : HW_ROP2_COPY;
@@ -192,7 +192,7 @@ static void lynxfb_ops_fillrect(struct fb_info *info,
spin_lock(_dev->slock);
sm750_dev->accel.de_fillrect(_dev->accel,
-base, pitch, Bpp,
+base, pitch, bpp,
region->dx, region->dy,
region->width, region->height,
color, rop);
@@ -204,7 +204,7 @@ static void lynxfb_ops_copyarea(struct fb_info *info,
{
struct lynxfb_par *par;
struct sm750_dev *sm750_dev;
- unsigned int base, pitch, Bpp;
+ unsigned int base, pitch, bpp;
par = info->par;
sm750_dev = par->dev;
@@ -215,7 +215,7 @@ static void lynxfb_ops_copyarea(struct fb_info *info,
*/
base = par->crtc.o_screen;
pitch = info->fix.line_length;
- Bpp = info->var.bits_per_pixel >> 3;
+ bpp = info->var.bits_per_pixel >> 3;
/*
* If not use spin_lock, system will die if user load driver
@@ -227,7 +227,7 @@ static void lynxfb_ops_copyarea(struct fb_info *info,
sm750_dev->accel.de_copyarea(_dev->accel,
base, pitch, region->sx, region->sy,
-base, pitch, Bpp, region->dx, region->dy,
+base, pitch, bpp, region->dx, region->dy,
region->width, region->height,
HW_ROP2_COPY);
spin_unlock(_dev->slock);
@@ -236,7 +236,7 @@ static void lynxfb_ops_copyarea(struct fb_info *info,
static void lynxfb_ops_imageblit(struct fb_info *info,
const struct fb_image *image)
{
- unsigned int base, pitch, Bpp;
+ unsigned int base, pitch, bpp;
unsigned int fgcol, bgcol;
struct lynxfb_par *par;
struct sm750_dev *sm750_dev;
@@ -249,7 +249,7 @@ static void lynxfb_ops_imageblit(struct fb_info *info,
*/
base = par->crtc.o_screen;
pitch = info->fix.line_length;
- Bpp = info->var.bits_per_pixel >> 3;
+ bpp = info->var.bits_per_pixel >> 3;
/* TODO: Implement hardware acceleration for image->depth > 1 */
if (image->depth != 1) {
@@ -276,7 +276,7 @@ static void lynxfb_ops_imageblit(struct fb_info *info,
sm750_dev->accel.de_imageblit(_dev->accel,
image->data, image->width >> 3, 0,
- base, pitch, Bpp,
+ base, pitch, bpp,
image->dx, image->dy,
image->width, image->height,
fgcol, bgcol, HW_ROP2_COPY);
--
2.30.2
[PATCH v2 44/49] staging: sm750fb: Rename function hw_sm750_crtc_checkMode to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
hw_sm750_crtc_checkMode.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750.h| 2 +-
drivers/staging/sm750fb/sm750_hw.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index bb25ab4ba0de..162eaf08db4c 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -512,7 +512,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo
*var,
return -ENOMEM;
}
- return hw_sm750_crtc_checkMode(crtc, var);
+ return hw_sm750_crtc_check_mode(crtc, var);
}
static int lynxfb_ops_setcolreg(unsigned int regno,
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index a27aaac5d67a..2e6481809d43 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -201,7 +201,7 @@ int hw_sm750_output_set_mode(struct lynxfb_output *output,
struct fb_var_screeninfo *var,
struct fb_fix_screeninfo *fix);
-int hw_sm750_crtc_checkMode(struct lynxfb_crtc *crtc,
+int hw_sm750_crtc_check_mode(struct lynxfb_crtc *crtc,
struct fb_var_screeninfo *var);
int hw_sm750_crtc_set_mode(struct lynxfb_crtc *crtc,
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index 97b842148bcb..b445f075d0a9 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -221,7 +221,7 @@ int hw_sm750_output_set_mode(struct lynxfb_output *output,
return ret;
}
-int hw_sm750_crtc_checkMode(struct lynxfb_crtc *crtc,
+int hw_sm750_crtc_check_mode(struct lynxfb_crtc *crtc,
struct fb_var_screeninfo *var)
{
struct sm750_dev *sm750_dev;
--
2.30.2
[PATCH v2 43/49] staging: sm750fb: Update members of lynx_accel struct to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the members of
lynx_accel structure, in particular dprBase and dpPortBase.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.h | 4 ++--
drivers/staging/sm750fb/sm750_accel.c | 6 +++---
drivers/staging/sm750fb/sm750_hw.c| 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index da37fc81370b..a27aaac5d67a 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -50,9 +50,9 @@ struct init_status {
struct lynx_accel {
/* base virtual address of DPR registers */
- volatile unsigned char __iomem *dprBase;
+ volatile unsigned char __iomem *dpr_base;
/* base virtual address of de data port */
- volatile unsigned char __iomem *dpPortBase;
+ volatile unsigned char __iomem *dp_port_base;
/* function pointers */
void (*de_init)(struct lynx_accel *accel);
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index d0b64962b10e..6ca2e5265836 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -20,17 +20,17 @@
#include "sm750_accel.h"
static inline void write_dpr(struct lynx_accel *accel, int offset, u32
reg_value)
{
- writel(reg_value, accel->dprBase + offset);
+ writel(reg_value, accel->dpr_base + offset);
}
static inline u32 read_dpr(struct lynx_accel *accel, int offset)
{
- return readl(accel->dprBase + offset);
+ return readl(accel->dpr_base + offset);
}
static inline void write_dp_port(struct lynx_accel *accel, u32 data)
{
- writel(data, accel->dpPortBase);
+ writel(data, accel->dp_port_base);
}
void sm750_hw_de_init(struct lynx_accel *accel)
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index 789199e628cd..97b842148bcb 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -60,8 +60,8 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev
*pdev)
pr_info("mmio virtual addr = %p\n", sm750_dev->reg);
}
- sm750_dev->accel.dprBase = sm750_dev->reg + DE_BASE_ADDR_TYPE1;
- sm750_dev->accel.dpPortBase = sm750_dev->reg + DE_PORT_ADDR_TYPE1;
+ sm750_dev->accel.dpr_base = sm750_dev->reg + DE_BASE_ADDR_TYPE1;
+ sm750_dev->accel.dp_port_base = sm750_dev->reg + DE_PORT_ADDR_TYPE1;
mmio750 = sm750_dev->reg;
sm750_set_chip_type(sm750_dev->devid, sm750_dev->revid);
--
2.30.2
[PATCH v2 42/49] staging: sm750fb: Rename functions *_deWait to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the functions
hw_sm750le_deWait and hw_sm750_deWait.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750.h| 4 ++--
drivers/staging/sm750fb/sm750_hw.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 05f3a1d454db..bb25ab4ba0de 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -609,7 +609,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
hw_sm750le_set_blank : hw_sm750_set_blank;
/* chip specific phase */
sm750_dev->accel.de_wait = (sm750_dev->revid == SM750LE_REVISION_ID) ?
- hw_sm750le_deWait : hw_sm750_deWait;
+ hw_sm750le_de_wait : hw_sm750_de_wait;
switch (sm750_dev->dataflow) {
case sm750_simul_pri:
output->paths = sm750_pnc;
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 4f9fe3e9ef81..da37fc81370b 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -194,8 +194,8 @@ static inline unsigned long ps_to_hz(unsigned int psvalue)
int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev);
int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev);
void hw_sm750_init_accel(struct sm750_dev *sm750_dev);
-int hw_sm750_deWait(void);
-int hw_sm750le_deWait(void);
+int hw_sm750_de_wait(void);
+int hw_sm750le_de_wait(void);
int hw_sm750_output_set_mode(struct lynxfb_output *output,
struct fb_var_screeninfo *var,
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index db2c87fe7006..789199e628cd 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -506,7 +506,7 @@ void hw_sm750_init_accel(struct sm750_dev *sm750_dev)
sm750_dev->accel.de_init(_dev->accel);
}
-int hw_sm750le_deWait(void)
+int hw_sm750le_de_wait(void)
{
int i = 0x1000;
unsigned int mask = DE_STATE2_DE_STATUS_BUSY | DE_STATE2_DE_FIFO_EMPTY |
@@ -523,7 +523,7 @@ int hw_sm750le_deWait(void)
return -1;
}
-int hw_sm750_deWait(void)
+int hw_sm750_de_wait(void)
{
int i = 0x1000;
unsigned int mask = SYSTEM_CTRL_DE_STATUS_BUSY |
--
2.30.2
[PATCH v2 41/49] staging: sm750fb: Rename function hw_sm750_initAccel to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
hw_sm750_init_accel.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.h| 2 +-
drivers/staging/sm750fb/sm750_hw.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 7347be7dcded..4f9fe3e9ef81 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -193,7 +193,7 @@ static inline unsigned long ps_to_hz(unsigned int psvalue)
int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev);
int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev);
-void hw_sm750_initAccel(struct sm750_dev *sm750_dev);
+void hw_sm750_init_accel(struct sm750_dev *sm750_dev);
int hw_sm750_deWait(void);
int hw_sm750le_deWait(void);
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index 87d2b82f0880..db2c87fe7006 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -175,7 +175,7 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct
pci_dev *pdev)
/* init 2d engine */
if (!sm750_dev->accel_off)
- hw_sm750_initAccel(sm750_dev);
+ hw_sm750_init_accel(sm750_dev);
return 0;
}
@@ -476,7 +476,7 @@ int hw_sm750_set_blank(struct lynxfb_output *output, int
blank)
return 0;
}
-void hw_sm750_initAccel(struct sm750_dev *sm750_dev)
+void hw_sm750_init_accel(struct sm750_dev *sm750_dev)
{
u32 reg;
--
2.30.2
[PATCH v2 38/49] staging: sm750fb: Rename function hw_sm750_setColReg to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
hw_sm750_setColReg.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750.h| 2 +-
drivers/staging/sm750fb/sm750_hw.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 8e803b580a71..62c9a8c5de8f 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -545,7 +545,7 @@ static int lynxfb_ops_setcolreg(unsigned int regno,
red >>= 8;
green >>= 8;
blue >>= 8;
- ret = hw_sm750_setColReg(crtc, regno, red, green, blue);
+ ret = hw_sm750_set_col_reg(crtc, regno, red, green, blue);
goto exit;
}
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index b46d13134f76..71b4ce05f4fe 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -208,7 +208,7 @@ int hw_sm750_crtc_set_mode(struct lynxfb_crtc *crtc,
struct fb_var_screeninfo *var,
struct fb_fix_screeninfo *fix);
-int hw_sm750_setColReg(struct lynxfb_crtc *crtc, ushort index,
+int hw_sm750_set_col_reg(struct lynxfb_crtc *crtc, ushort index,
ushort red, ushort green, ushort blue);
int hw_sm750_setBLANK(struct lynxfb_output *output, int blank);
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index 410f726b03e9..7eae56b74a2b 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -372,7 +372,7 @@ int hw_sm750_crtc_set_mode(struct lynxfb_crtc *crtc,
return ret;
}
-int hw_sm750_setColReg(struct lynxfb_crtc *crtc, ushort index,
+int hw_sm750_set_col_reg(struct lynxfb_crtc *crtc, ushort index,
ushort red, ushort green, ushort blue)
{
static unsigned int add[] = {PANEL_PALETTE_RAM, CRT_PALETTE_RAM};
--
2.30.2
[PATCH v2 39/49] staging: sm750fb: Rename functions *_setBLANK to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the functions
hw_sm750_setBLANK and hw_sm750le_setBLANK.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750.h| 4 ++--
drivers/staging/sm750fb/sm750_hw.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 62c9a8c5de8f..05f3a1d454db 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -606,7 +606,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
crtc->ywrapstep = 0;
output->proc_setBLANK = (sm750_dev->revid == SM750LE_REVISION_ID) ?
-hw_sm750le_setBLANK : hw_sm750_setBLANK;
+hw_sm750le_set_blank : hw_sm750_set_blank;
/* chip specific phase */
sm750_dev->accel.de_wait = (sm750_dev->revid == SM750LE_REVISION_ID) ?
hw_sm750le_deWait : hw_sm750_deWait;
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 71b4ce05f4fe..7347be7dcded 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -211,8 +211,8 @@ int hw_sm750_crtc_set_mode(struct lynxfb_crtc *crtc,
int hw_sm750_set_col_reg(struct lynxfb_crtc *crtc, ushort index,
ushort red, ushort green, ushort blue);
-int hw_sm750_setBLANK(struct lynxfb_output *output, int blank);
-int hw_sm750le_setBLANK(struct lynxfb_output *output, int blank);
+int hw_sm750_set_blank(struct lynxfb_output *output, int blank);
+int hw_sm750le_set_blank(struct lynxfb_output *output, int blank);
int hw_sm750_pan_display(struct lynxfb_crtc *crtc,
const struct fb_var_screeninfo *var,
const struct fb_info *info);
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index 7eae56b74a2b..87d2b82f0880 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -382,7 +382,7 @@ int hw_sm750_set_col_reg(struct lynxfb_crtc *crtc, ushort
index,
return 0;
}
-int hw_sm750le_setBLANK(struct lynxfb_output *output, int blank)
+int hw_sm750le_set_blank(struct lynxfb_output *output, int blank)
{
int dpms, crtdb;
@@ -423,7 +423,7 @@ int hw_sm750le_setBLANK(struct lynxfb_output *output, int
blank)
return 0;
}
-int hw_sm750_setBLANK(struct lynxfb_output *output, int blank)
+int hw_sm750_set_blank(struct lynxfb_output *output, int blank)
{
unsigned int dpms, pps, crtdb;
--
2.30.2
[PATCH v2 40/49] staging: sm750fb: Rename function sm750_hw_cursor_setData2 to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
sm750_hw_cursor_setData2.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750_cursor.c | 2 +-
drivers/staging/sm750fb/sm750_cursor.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750_cursor.c
b/drivers/staging/sm750fb/sm750_cursor.c
index 98d294ac223c..3ee3bf78f7a5 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -132,7 +132,7 @@ void sm750_hw_cursor_set_data(struct lynx_cursor *cursor,
u16 rop,
}
}
-void sm750_hw_cursor_setData2(struct lynx_cursor *cursor, u16 rop,
+void sm750_hw_cursor_set_data2(struct lynx_cursor *cursor, u16 rop,
const u8 *pcol, const u8 *pmsk)
{
int i, j, count, pitch, offset;
diff --git a/drivers/staging/sm750fb/sm750_cursor.h
b/drivers/staging/sm750fb/sm750_cursor.h
index af0211242ae8..8a1e81b8248d 100644
--- a/drivers/staging/sm750fb/sm750_cursor.h
+++ b/drivers/staging/sm750fb/sm750_cursor.h
@@ -10,6 +10,6 @@ void sm750_hw_cursor_set_pos(struct lynx_cursor *cursor, int
x, int y);
void sm750_hw_cursor_set_color(struct lynx_cursor *cursor, u32 fg, u32 bg);
void sm750_hw_cursor_set_data(struct lynx_cursor *cursor, u16 rop,
const u8 *data, const u8 *mask);
-void sm750_hw_cursor_setData2(struct lynx_cursor *cursor, u16 rop,
+void sm750_hw_cursor_set_data2(struct lynx_cursor *cursor, u16 rop,
const u8 *data, const u8 *mask);
#endif
--
2.30.2
[PATCH v2 37/49] staging: sm750fb: Rename function hw_sm750_output_setMode to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
hw_sm750_output_set_mod.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750.h| 2 +-
drivers/staging/sm750fb/sm750_hw.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 2c944539eaf0..8e803b580a71 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -395,7 +395,7 @@ static int lynxfb_ops_set_par(struct fb_info *info)
}
ret = hw_sm750_crtc_set_mode(crtc, var, fix);
if (!ret)
- ret = hw_sm750_output_setMode(output, var, fix);
+ ret = hw_sm750_output_set_mode(output, var, fix);
return ret;
}
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 368e5cc19147..b46d13134f76 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -197,7 +197,7 @@ void hw_sm750_initAccel(struct sm750_dev *sm750_dev);
int hw_sm750_deWait(void);
int hw_sm750le_deWait(void);
-int hw_sm750_output_setMode(struct lynxfb_output *output,
+int hw_sm750_output_set_mode(struct lynxfb_output *output,
struct fb_var_screeninfo *var,
struct fb_fix_screeninfo *fix);
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index 7c852c6a153b..410f726b03e9 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -180,7 +180,7 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct
pci_dev *pdev)
return 0;
}
-int hw_sm750_output_setMode(struct lynxfb_output *output,
+int hw_sm750_output_set_mode(struct lynxfb_output *output,
struct fb_var_screeninfo *var,
struct fb_fix_screeninfo *fix)
{
--
2.30.2
[PATCH v2 36/49] staging: sm750fb: Update members of lynxfb_crtc struct to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the members of the
struct lynxfb_crtc, in particular vCursor, vScreen, oCursor, and
oScreen.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 44 +++---
drivers/staging/sm750fb/sm750.h| 8 +++---
drivers/staging/sm750fb/sm750_hw.c | 6 ++--
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 22881d35c9ad..2c944539eaf0 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -175,7 +175,7 @@ static void lynxfb_ops_fillrect(struct fb_info *info,
* each time 2d function begin to work,below three variable always need
* be set, seems we can put them together in some place
*/
- base = par->crtc.oScreen;
+ base = par->crtc.o_screen;
pitch = info->fix.line_length;
Bpp = info->var.bits_per_pixel >> 3;
@@ -213,7 +213,7 @@ static void lynxfb_ops_copyarea(struct fb_info *info,
* each time 2d function begin to work,below three variable always need
* be set, seems we can put them together in some place
*/
- base = par->crtc.oScreen;
+ base = par->crtc.o_screen;
pitch = info->fix.line_length;
Bpp = info->var.bits_per_pixel >> 3;
@@ -247,7 +247,7 @@ static void lynxfb_ops_imageblit(struct fb_info *info,
* each time 2d function begin to work,below three variable always need
* be set, seems we can put them together in some place
*/
- base = par->crtc.oScreen;
+ base = par->crtc.o_screen;
pitch = info->fix.line_length;
Bpp = info->var.bits_per_pixel >> 3;
@@ -451,7 +451,7 @@ static int __maybe_unused lynxfb_resume(struct device *dev)
crtc = >crtc;
cursor = >cursor;
memset_io(cursor->vstart, 0x0, cursor->size);
- memset_io(crtc->vScreen, 0x0, crtc->vidmem_size);
+ memset_io(crtc->v_screen, 0x0, crtc->vidmem_size);
lynxfb_ops_set_par(info);
fb_set_suspend(info, 0);
}
@@ -463,7 +463,7 @@ static int __maybe_unused lynxfb_resume(struct device *dev)
crtc = >crtc;
cursor = >cursor;
memset_io(cursor->vstart, 0x0, cursor->size);
- memset_io(crtc->vScreen, 0x0, crtc->vidmem_size);
+ memset_io(crtc->v_screen, 0x0, crtc->vidmem_size);
lynxfb_ops_set_par(info);
fb_set_suspend(info, 0);
}
@@ -614,44 +614,44 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
case sm750_simul_pri:
output->paths = sm750_pnc;
crtc->channel = sm750_primary;
- crtc->oScreen = 0;
- crtc->vScreen = sm750_dev->mem;
+ crtc->o_screen = 0;
+ crtc->v_screen = sm750_dev->mem;
pr_info("use simul primary mode\n");
break;
case sm750_simul_sec:
output->paths = sm750_pnc;
crtc->channel = sm750_secondary;
- crtc->oScreen = 0;
- crtc->vScreen = sm750_dev->mem;
+ crtc->o_screen = 0;
+ crtc->v_screen = sm750_dev->mem;
break;
case sm750_dual_normal:
if (par->index == 0) {
output->paths = sm750_panel;
crtc->channel = sm750_primary;
- crtc->oScreen = 0;
- crtc->vScreen = sm750_dev->mem;
+ crtc->o_screen = 0;
+ crtc->v_screen = sm750_dev->mem;
} else {
output->paths = sm750_crt;
crtc->channel = sm750_secondary;
- /* not consider of padding stuffs for oScreen,need fix
*/
- crtc->oScreen = sm750_dev->vidmem_size >> 1;
- crtc->vScreen = sm750_dev->mem + crtc->oScreen;
+ /* not consider of padding stuffs for o_screen,need fix
*/
+ crtc->o_screen = sm750_dev->vidmem_size >> 1;
+ crtc->v_screen = sm750_dev->mem + crtc->o_screen;
}
break;
case sm750_dual_swap:
if (par->index == 0) {
output->paths = sm750_panel;
crtc->channel = sm750_secondary;
- crtc->oScreen = 0;
- crtc->vScreen = sm750_dev->mem;
+ crtc->o_screen = 0;
+ crtc->v_screen =
[PATCH v2 35/49] staging: sm750fb: Update members of sm750_dev struct to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the members of
sm750_dev structure, in particular initParam, pvReg, pvMem, and hwCursor.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 36 +++---
drivers/staging/sm750fb/sm750.h| 8 +++
drivers/staging/sm750fb/sm750_hw.c | 22 +-
3 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 58de4b9575d9..22881d35c9ad 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -598,7 +598,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
crtc->vidmem_size >>= 1;
/* setup crtc and output member */
- sm750_dev->hwCursor = g_hwcursor;
+ sm750_dev->hw_cursor = g_hwcursor;
crtc->line_pad = 16;
crtc->xpanstep = 8;
@@ -615,27 +615,27 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
output->paths = sm750_pnc;
crtc->channel = sm750_primary;
crtc->oScreen = 0;
- crtc->vScreen = sm750_dev->pvMem;
+ crtc->vScreen = sm750_dev->mem;
pr_info("use simul primary mode\n");
break;
case sm750_simul_sec:
output->paths = sm750_pnc;
crtc->channel = sm750_secondary;
crtc->oScreen = 0;
- crtc->vScreen = sm750_dev->pvMem;
+ crtc->vScreen = sm750_dev->mem;
break;
case sm750_dual_normal:
if (par->index == 0) {
output->paths = sm750_panel;
crtc->channel = sm750_primary;
crtc->oScreen = 0;
- crtc->vScreen = sm750_dev->pvMem;
+ crtc->vScreen = sm750_dev->mem;
} else {
output->paths = sm750_crt;
crtc->channel = sm750_secondary;
/* not consider of padding stuffs for oScreen,need fix
*/
crtc->oScreen = sm750_dev->vidmem_size >> 1;
- crtc->vScreen = sm750_dev->pvMem + crtc->oScreen;
+ crtc->vScreen = sm750_dev->mem + crtc->oScreen;
}
break;
case sm750_dual_swap:
@@ -643,7 +643,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
output->paths = sm750_panel;
crtc->channel = sm750_secondary;
crtc->oScreen = 0;
- crtc->vScreen = sm750_dev->pvMem;
+ crtc->vScreen = sm750_dev->mem;
} else {
output->paths = sm750_crt;
crtc->channel = sm750_primary;
@@ -651,7 +651,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
* need fix
*/
crtc->oScreen = sm750_dev->vidmem_size >> 1;
- crtc->vScreen = sm750_dev->pvMem + crtc->oScreen;
+ crtc->vScreen = sm750_dev->mem + crtc->oScreen;
}
break;
default:
@@ -719,13 +719,13 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int
index)
* must be set after crtc member initialized
*/
crtc->cursor.offset = crtc->oScreen + crtc->vidmem_size - 1024;
- crtc->cursor.mmio = sm750_dev->pvReg +
+ crtc->cursor.mmio = sm750_dev->reg +
0x800f0 + (int)crtc->channel * 0x140;
pr_info("crtc->cursor.mmio = %p\n", crtc->cursor.mmio);
crtc->cursor.max_h = crtc->cursor.max_w = 64;
crtc->cursor.size = crtc->cursor.max_h * crtc->cursor.max_w * 2 / 8;
- crtc->cursor.vstart = sm750_dev->pvMem + crtc->cursor.offset;
+ crtc->cursor.vstart = sm750_dev->mem + crtc->cursor.offset;
memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
if (!g_hwcursor) {
@@ -870,12 +870,12 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev,
char *src)
swap = 0;
- sm750_dev->initParm.chip_clk = 0;
- sm750_dev->initParm.mem_clk = 0;
- sm750_dev->initParm.master_clk = 0;
- sm750_dev->initParm.power_mode = 0;
- sm750_dev->initParm.set_all_eng_off = 0;
- sm750_dev->initParm.reset_memory = 1;
+ sm750_dev->init_parm.chip_clk = 0;
+ sm750_dev->init_parm.mem_clk = 0;
+ sm750_dev->init_parm.master_clk = 0;
+ sm750_dev->init_parm.power_mode = 0;
+ sm750_dev->
[PATCH v2 34/49] staging: sm750fb: Update members of init_status struct to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the members of the
struct init_status, in particular powerMode, setAllEngOff,
and resetMemory.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c | 6 +++---
drivers/staging/sm750fb/sm750.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 2343cd897989..58de4b9575d9 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -873,9 +873,9 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char
*src)
sm750_dev->initParm.chip_clk = 0;
sm750_dev->initParm.mem_clk = 0;
sm750_dev->initParm.master_clk = 0;
- sm750_dev->initParm.powerMode = 0;
- sm750_dev->initParm.setAllEngOff = 0;
- sm750_dev->initParm.resetMemory = 1;
+ sm750_dev->initParm.power_mode = 0;
+ sm750_dev->initParm.set_all_eng_off = 0;
+ sm750_dev->initParm.reset_memory = 1;
/* defaultly turn g_hwcursor on for both view */
g_hwcursor = 3;
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 6e0805a99180..f946d35d30d0 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -39,13 +39,13 @@ enum sm750_path {
};
struct init_status {
- ushort powerMode;
+ ushort power_mode;
/* below three clocks are in unit of MHZ*/
ushort chip_clk;
ushort mem_clk;
ushort master_clk;
- ushort setAllEngOff;
- ushort resetMemory;
+ ushort set_all_eng_off;
+ ushort reset_memory;
};
struct lynx_accel {
--
2.30.2
[PATCH v2 33/49] staging: sm750fb: Rename function hw_sm750_crtc_setMode to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
hw_sm750_crtc_setMode.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750.h| 2 +-
drivers/staging/sm750fb/sm750_hw.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 9263d4bdd222..2343cd897989 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -393,7 +393,7 @@ static int lynxfb_ops_set_par(struct fb_info *info)
pr_err("bpp %d not supported\n", var->bits_per_pixel);
return ret;
}
- ret = hw_sm750_crtc_setMode(crtc, var, fix);
+ ret = hw_sm750_crtc_set_mode(crtc, var, fix);
if (!ret)
ret = hw_sm750_output_setMode(output, var, fix);
return ret;
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 8271cf7c89f3..6e0805a99180 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -204,7 +204,7 @@ int hw_sm750_output_setMode(struct lynxfb_output *output,
int hw_sm750_crtc_checkMode(struct lynxfb_crtc *crtc,
struct fb_var_screeninfo *var);
-int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
+int hw_sm750_crtc_set_mode(struct lynxfb_crtc *crtc,
struct fb_var_screeninfo *var,
struct fb_fix_screeninfo *fix);
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index e31f4c6bc69e..efe379ef3438 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -247,7 +247,7 @@ int hw_sm750_crtc_checkMode(struct lynxfb_crtc *crtc,
}
/* set the controller's mode for @crtc charged with @var and @fix parameters */
-int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
+int hw_sm750_crtc_set_mode(struct lynxfb_crtc *crtc,
struct fb_var_screeninfo *var,
struct fb_fix_screeninfo *fix)
{
--
2.30.2
[PATCH v2 32/49] staging: sm750fb: Rename function sm750_hw_cursor_setData to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
sm750_hw_cursor_setData.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750_cursor.c | 2 +-
drivers/staging/sm750fb/sm750_cursor.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index d93884f9da7f..9263d4bdd222 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -145,7 +145,7 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct
fb_cursor *fbcursor)
}
if (fbcursor->set & (FB_CUR_SETSHAPE | FB_CUR_SETIMAGE)) {
- sm750_hw_cursor_setData(cursor,
+ sm750_hw_cursor_set_data(cursor,
fbcursor->rop,
fbcursor->image.data,
fbcursor->mask);
diff --git a/drivers/staging/sm750fb/sm750_cursor.c
b/drivers/staging/sm750fb/sm750_cursor.c
index ac83ead1c5bc..98d294ac223c 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -82,7 +82,7 @@ void sm750_hw_cursor_set_color(struct lynx_cursor *cursor,
u32 fg, u32 bg)
poke32(HWC_COLOR_3, 0xffe0);
}
-void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16 rop,
+void sm750_hw_cursor_set_data(struct lynx_cursor *cursor, u16 rop,
const u8 *pcol, const u8 *pmsk)
{
int i, j, count, pitch, offset;
diff --git a/drivers/staging/sm750fb/sm750_cursor.h
b/drivers/staging/sm750fb/sm750_cursor.h
index edfa6a8202cd..af0211242ae8 100644
--- a/drivers/staging/sm750fb/sm750_cursor.h
+++ b/drivers/staging/sm750fb/sm750_cursor.h
@@ -8,7 +8,7 @@ void sm750_hw_cursor_disable(struct lynx_cursor *cursor);
void sm750_hw_cursor_set_size(struct lynx_cursor *cursor, int w, int h);
void sm750_hw_cursor_set_pos(struct lynx_cursor *cursor, int x, int y);
void sm750_hw_cursor_set_color(struct lynx_cursor *cursor, u32 fg, u32 bg);
-void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16 rop,
+void sm750_hw_cursor_set_data(struct lynx_cursor *cursor, u16 rop,
const u8 *data, const u8 *mask);
void sm750_hw_cursor_setData2(struct lynx_cursor *cursor, u16 rop,
const u8 *data, const u8 *mask);
--
2.30.2
[PATCH v2 31/49] staging: sm750fb: Rename function sm750_hw_cursor_setColor to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
sm750_hw_cursor_set_color.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750_cursor.c | 2 +-
drivers/staging/sm750fb/sm750_cursor.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index b76d3d40969a..d93884f9da7f 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -141,7 +141,7 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct
fb_cursor *fbcursor)
((info->cmap.green[fbcursor->image.bg_color] & 0xfc00) >>
5) |
((info->cmap.blue[fbcursor->image.bg_color] & 0xf800) >>
11);
- sm750_hw_cursor_setColor(cursor, fg, bg);
+ sm750_hw_cursor_set_color(cursor, fg, bg);
}
if (fbcursor->set & (FB_CUR_SETSHAPE | FB_CUR_SETIMAGE)) {
diff --git a/drivers/staging/sm750fb/sm750_cursor.c
b/drivers/staging/sm750fb/sm750_cursor.c
index 0ba80e086415..ac83ead1c5bc 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -73,7 +73,7 @@ void sm750_hw_cursor_set_pos(struct lynx_cursor *cursor, int
x, int y)
poke32(HWC_LOCATION, reg);
}
-void sm750_hw_cursor_setColor(struct lynx_cursor *cursor, u32 fg, u32 bg)
+void sm750_hw_cursor_set_color(struct lynx_cursor *cursor, u32 fg, u32 bg)
{
u32 reg = (fg << HWC_COLOR_12_2_RGB565_SHIFT) &
HWC_COLOR_12_2_RGB565_MASK;
diff --git a/drivers/staging/sm750fb/sm750_cursor.h
b/drivers/staging/sm750fb/sm750_cursor.h
index d0ade8e366f4..edfa6a8202cd 100644
--- a/drivers/staging/sm750fb/sm750_cursor.h
+++ b/drivers/staging/sm750fb/sm750_cursor.h
@@ -7,7 +7,7 @@ void sm750_hw_cursor_enable(struct lynx_cursor *cursor);
void sm750_hw_cursor_disable(struct lynx_cursor *cursor);
void sm750_hw_cursor_set_size(struct lynx_cursor *cursor, int w, int h);
void sm750_hw_cursor_set_pos(struct lynx_cursor *cursor, int x, int y);
-void sm750_hw_cursor_setColor(struct lynx_cursor *cursor, u32 fg, u32 bg);
+void sm750_hw_cursor_set_color(struct lynx_cursor *cursor, u32 fg, u32 bg);
void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16 rop,
const u8 *data, const u8 *mask);
void sm750_hw_cursor_setData2(struct lynx_cursor *cursor, u16 rop,
--
2.30.2
[PATCH v2 30/49] staging: sm750fb: Rename function sm750_hw_cursor_setPos to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
sm750_hw_cursor_set_pos.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750_cursor.c | 2 +-
drivers/staging/sm750fb/sm750_cursor.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index eeba12f4b267..b76d3d40969a 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -125,7 +125,7 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct
fb_cursor *fbcursor)
fbcursor->image.height);
if (fbcursor->set & FB_CUR_SETPOS)
- sm750_hw_cursor_setPos(cursor,
+ sm750_hw_cursor_set_pos(cursor,
fbcursor->image.dx - info->var.xoffset,
fbcursor->image.dy - info->var.yoffset);
diff --git a/drivers/staging/sm750fb/sm750_cursor.c
b/drivers/staging/sm750fb/sm750_cursor.c
index d5ef40b8bc8e..0ba80e086415 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -64,7 +64,7 @@ void sm750_hw_cursor_set_size(struct lynx_cursor *cursor, int
w, int h)
cursor->h = h;
}
-void sm750_hw_cursor_setPos(struct lynx_cursor *cursor, int x, int y)
+void sm750_hw_cursor_set_pos(struct lynx_cursor *cursor, int x, int y)
{
u32 reg;
diff --git a/drivers/staging/sm750fb/sm750_cursor.h
b/drivers/staging/sm750fb/sm750_cursor.h
index edeed2ea4b04..d0ade8e366f4 100644
--- a/drivers/staging/sm750fb/sm750_cursor.h
+++ b/drivers/staging/sm750fb/sm750_cursor.h
@@ -6,7 +6,7 @@
void sm750_hw_cursor_enable(struct lynx_cursor *cursor);
void sm750_hw_cursor_disable(struct lynx_cursor *cursor);
void sm750_hw_cursor_set_size(struct lynx_cursor *cursor, int w, int h);
-void sm750_hw_cursor_setPos(struct lynx_cursor *cursor, int x, int y);
+void sm750_hw_cursor_set_pos(struct lynx_cursor *cursor, int x, int y);
void sm750_hw_cursor_setColor(struct lynx_cursor *cursor, u32 fg, u32 bg);
void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16 rop,
const u8 *data, const u8 *mask);
--
2.30.2
[PATCH v2 29/49] staging: sm750fb: Rename function sm750_hw_cursor_setSize to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
sm750_hw_cursor_setSize.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 2 +-
drivers/staging/sm750fb/sm750_cursor.c | 2 +-
drivers/staging/sm750fb/sm750_cursor.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 4f5f68e6aa60..eeba12f4b267 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -120,7 +120,7 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct
fb_cursor *fbcursor)
sm750_hw_cursor_disable(cursor);
if (fbcursor->set & FB_CUR_SETSIZE)
- sm750_hw_cursor_setSize(cursor,
+ sm750_hw_cursor_set_size(cursor,
fbcursor->image.width,
fbcursor->image.height);
diff --git a/drivers/staging/sm750fb/sm750_cursor.c
b/drivers/staging/sm750fb/sm750_cursor.c
index 43e6f52c2551..d5ef40b8bc8e 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -58,7 +58,7 @@ void sm750_hw_cursor_disable(struct lynx_cursor *cursor)
poke32(HWC_ADDRESS, 0);
}
-void sm750_hw_cursor_setSize(struct lynx_cursor *cursor, int w, int h)
+void sm750_hw_cursor_set_size(struct lynx_cursor *cursor, int w, int h)
{
cursor->w = w;
cursor->h = h;
diff --git a/drivers/staging/sm750fb/sm750_cursor.h
b/drivers/staging/sm750fb/sm750_cursor.h
index b59643dd61ed..edeed2ea4b04 100644
--- a/drivers/staging/sm750fb/sm750_cursor.h
+++ b/drivers/staging/sm750fb/sm750_cursor.h
@@ -5,7 +5,7 @@
/* hw_cursor_xxx works for voyager,718 and 750 */
void sm750_hw_cursor_enable(struct lynx_cursor *cursor);
void sm750_hw_cursor_disable(struct lynx_cursor *cursor);
-void sm750_hw_cursor_setSize(struct lynx_cursor *cursor, int w, int h);
+void sm750_hw_cursor_set_size(struct lynx_cursor *cursor, int w, int h);
void sm750_hw_cursor_setPos(struct lynx_cursor *cursor, int x, int y);
void sm750_hw_cursor_setColor(struct lynx_cursor *cursor, u32 fg, u32 bg);
void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16 rop,
--
2.30.2
[PATCH v2 27/49] staging: sm750fb: Rename function params to snake case in sm750_accel.h
Fix "Avoid CamelCase" checkpatch.pl checks for function parameters in sm750_accel.h, in particular for functions sm750_hw_fillrect, sm750_hw_copyarea and sm750_hw_imageblit. Signed-off-by: Pavle Rohalj --- drivers/staging/sm750fb/sm750_accel.h | 42 +-- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h index 2c79cb730a0a..8a5d1fe5075a 100644 --- a/drivers/staging/sm750fb/sm750_accel.h +++ b/drivers/staging/sm750fb/sm750_accel.h @@ -190,19 +190,19 @@ void sm750_hw_set2dformat(struct lynx_accel *accel, int fmt); void sm750_hw_de_init(struct lynx_accel *accel); int sm750_hw_fillrect(struct lynx_accel *accel, - u32 base, u32 pitch, u32 Bpp, + u32 base, u32 pitch, u32 bpp, u32 x, u32 y, u32 width, u32 height, u32 color, u32 rop); /** * sm750_hm_copyarea - * @sBase: Address of source: offset in frame buffer - * @sPitch: Pitch value of source surface in BYTE + * @s_base: Address of source: offset in frame buffer + * @s_pitch: Pitch value of source surface in BYTE * @sx: Starting x coordinate of source surface * @sy: Starting y coordinate of source surface - * @dBase: Address of destination: offset in frame buffer - * @dPitch: Pitch value of destination surface in BYTE - * @Bpp: Color depth of destination surface + * @d_base: Address of destination: offset in frame buffer + * @d_pitch: Pitch value of destination surface in BYTE + * @bpp: Color depth of destination surface * @dx: Starting x coordinate of destination surface * @dy: Starting y coordinate of destination surface * @width: width of rectangle in pixel value @@ -210,34 +210,34 @@ int sm750_hw_fillrect(struct lynx_accel *accel, * @rop2: ROP value */ int sm750_hw_copyarea(struct lynx_accel *accel, - unsigned int sBase, unsigned int sPitch, + unsigned int s_base, unsigned int s_pitch, unsigned int sx, unsigned int sy, - unsigned int dBase, unsigned int dPitch, - unsigned int Bpp, unsigned int dx, unsigned int dy, + unsigned int d_base, unsigned int d_pitch, + unsigned int bpp, unsigned int dx, unsigned int dy, unsigned int width, unsigned int height, unsigned int rop2); /** * sm750_hw_imageblit - * @pSrcbuf: pointer to start of source buffer in system memory - * @srcDelta: Pitch value (in bytes) of the source buffer, +ive means top down + * @src_buf: pointer to start of source buffer in system memory + * @src_delta: Pitch value (in bytes) of the source buffer, +ive means top down *>- and -ive mean button up - * @startBit: Mono data can start at any bit in a byte, this value should be + * @start_bit: Mono data can start at any bit in a byte, this value should be *>- 0 to 7 - * @dBase: Address of destination: offset in frame buffer - * @dPitch: Pitch value of destination surface in BYTE - * @bytePerPixel: Color depth of destination surface + * @d_base: Address of destination: offset in frame buffer + * @d_pitch: Pitch value of destination surface in BYTE + * @byte_per_pixel: Color depth of destination surface * @dx: Starting x coordinate of destination surface * @dy: Starting y coordinate of destination surface * @width: width of rectangle in pixel value * @height: height of rectangle in pixel value - * @fColor: Foreground color (corresponding to a 1 in the monochrome data - * @bColor: Background color (corresponding to a 0 in the monochrome data + * @f_color: Foreground color (corresponding to a 1 in the monochrome data + * @b_color: Background color (corresponding to a 0 in the monochrome data * @rop2: ROP value */ -int sm750_hw_imageblit(struct lynx_accel *accel, const char *pSrcbuf, - u32 srcDelta, u32 startBit, u32 dBase, u32 dPitch, - u32 bytePerPixel, u32 dx, u32 dy, u32 width, - u32 height, u32 fColor, u32 bColor, u32 rop2); +int sm750_hw_imageblit(struct lynx_accel *accel, const char *src_buf, + u32 src_delta, u32 start_bit, u32 d_base, u32 d_pitch, + u32 byte_per_pixel, u32 dx, u32 dy, u32 width, + u32 height, u32 f_color, u32 b_color, u32 rop2); #endif -- 2.30.2
[PATCH v2 28/49] staging: sm750fb: Update members of lynx_cursor to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the members
of lynx_cursor structure, in particular maxW and maxH.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750.c| 8
drivers/staging/sm750fb/sm750.h| 4 ++--
drivers/staging/sm750fb/sm750_cursor.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index c237a8f8eb59..4f5f68e6aa60 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -112,8 +112,8 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct
fb_cursor *fbcursor)
crtc = >crtc;
cursor = >cursor;
- if (fbcursor->image.width > cursor->maxW ||
- fbcursor->image.height > cursor->maxH ||
+ if (fbcursor->image.width > cursor->max_w ||
+ fbcursor->image.height > cursor->max_h ||
fbcursor->image.depth > 1) {
return -ENXIO;
}
@@ -723,8 +723,8 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int
index)
0x800f0 + (int)crtc->channel * 0x140;
pr_info("crtc->cursor.mmio = %p\n", crtc->cursor.mmio);
- crtc->cursor.maxH = crtc->cursor.maxW = 64;
- crtc->cursor.size = crtc->cursor.maxH * crtc->cursor.maxW * 2 / 8;
+ crtc->cursor.max_h = crtc->cursor.max_w = 64;
+ crtc->cursor.size = crtc->cursor.max_h * crtc->cursor.max_w * 2 / 8;
crtc->cursor.vstart = sm750_dev->pvMem + crtc->cursor.offset;
memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 23eefd019ec9..8271cf7c89f3 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -122,8 +122,8 @@ struct lynx_cursor {
int h;
int size;
/* hardware limitation */
- int maxW;
- int maxH;
+ int max_w;
+ int max_h;
/* base virtual address and offset of cursor image */
char __iomem *vstart;
int offset;
diff --git a/drivers/staging/sm750fb/sm750_cursor.c
b/drivers/staging/sm750fb/sm750_cursor.c
index bbbef27cb329..43e6f52c2551 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -97,7 +97,7 @@ void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16
rop,
count = pitch * cursor->h;
/* in byte */
- offset = cursor->maxW * 2 / 8;
+ offset = cursor->max_w * 2 / 8;
data = 0;
pstart = cursor->vstart;
@@ -147,7 +147,7 @@ void sm750_hw_cursor_setData2(struct lynx_cursor *cursor,
u16 rop,
count = pitch * cursor->h;
/* in byte */
- offset = cursor->maxW * 2 / 8;
+ offset = cursor->max_w * 2 / 8;
data = 0;
pstart = cursor->vstart;
--
2.30.2
[PATCH v2 26/49] staging: sm750fb: Update function parameter of sm750_hw_imageblit to snake case
Fix "Avoid CamelCase" checkpoint.pl checks for the function parameter
fColor in the function sm750_hw_imageblit.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750_accel.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index 8ab7d827a99e..d0b64962b10e 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -310,14 +310,14 @@ static unsigned int de_get_transparency(struct lynx_accel
*accel)
* @dy: Starting y coordinate of destination surface
* @width: width of rectangle in pixel value
* @height: height of rectangle in pixel value
- * @fColor: Foreground color (corresponding to a 1 in the monochrome data
+ * @f_color: Foreground color (corresponding to a 1 in the monochrome data
* @b_olor: Background color (corresponding to a 0 in the monochrome data
* @rop2: ROP value
*/
int sm750_hw_imageblit(struct lynx_accel *accel, const char *src_buf,
u32 src_delta, u32 start_bit, u32 d_base, u32 d_pitch,
u32 byte_per_pixel, u32 dx, u32 dy, u32 width,
- u32 height, u32 fColor, u32 b_olor, u32 rop2)
+ u32 height, u32 f_color, u32 b_olor, u32 rop2)
{
unsigned int ul_bytes_per_scan;
unsigned int ul4_bytes_per_scan;
@@ -383,7 +383,7 @@ int sm750_hw_imageblit(struct lynx_accel *accel, const char
*src_buf,
((width << DE_DIMENSION_X_SHIFT) & DE_DIMENSION_X_MASK) |
(height & DE_DIMENSION_Y_ET_MASK)); /* dpr08 */
- write_dpr(accel, DE_FOREGROUND, fColor);
+ write_dpr(accel, DE_FOREGROUND, f_color);
write_dpr(accel, DE_BACKGROUND, b_olor);
de_ctrl = (rop2 & DE_CONTROL_ROP_MASK) |
--
2.30.2
[PATCH v2 25/49] staging: sm750fb: Rename deGetTransparency to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
deGetTransparency in sm750_accel.c.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750_accel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index 1eeedacfc4a8..8ab7d827a99e 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -284,7 +284,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel,
return 0;
}
-static unsigned int deGetTransparency(struct lynx_accel *accel)
+static unsigned int de_get_transparency(struct lynx_accel *accel)
{
unsigned int de_ctrl;
@@ -390,7 +390,7 @@ int sm750_hw_imageblit(struct lynx_accel *accel, const char
*src_buf,
DE_CONTROL_ROP_SELECT | DE_CONTROL_COMMAND_HOST_WRITE |
DE_CONTROL_HOST | DE_CONTROL_STATUS;
- write_dpr(accel, DE_CONTROL, de_ctrl | deGetTransparency(accel));
+ write_dpr(accel, DE_CONTROL, de_ctrl | de_get_transparency(accel));
/* Write MONO data (line by line) to 2D Engine data port */
for (i = 0; i < height; i++) {
--
2.30.2
[PATCH v2 23/49] staging: sm750fb: Update local variables in sm750_hw_imageblit to snake case
Fix "Avoid CamelCase" checkpoint.pl checks for the local variables
in the function sm750_hw_imageblit.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750_accel.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index 760dd036d71a..c840873e9622 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -319,17 +319,17 @@ int sm750_hw_imageblit(struct lynx_accel *accel, const
char *src_buf,
u32 byte_per_pixel, u32 dx, u32 dy, u32 width,
u32 height, u32 fColor, u32 b_olor, u32 rop2)
{
- unsigned int ulBytesPerScan;
- unsigned int ul4BytesPerScan;
- unsigned int ulBytesRemain;
+ unsigned int ul_bytes_per_scan;
+ unsigned int ul4_bytes_per_scan;
+ unsigned int ul_bytes_remain;
unsigned int de_ctrl = 0;
- unsigned char ajRemain[4];
+ unsigned char aj_remain[4];
int i, j;
start_bit &= 7; /* Just make sure the start bit is within legal range */
- ulBytesPerScan = (width + start_bit + 7) / 8;
- ul4BytesPerScan = ulBytesPerScan & ~3;
- ulBytesRemain = ulBytesPerScan & 3;
+ ul_bytes_per_scan = (width + start_bit + 7) / 8;
+ ul4_bytes_per_scan = ul_bytes_per_scan & ~3;
+ ul_bytes_remain = ul_bytes_per_scan & 3;
if (accel->de_wait() != 0)
return -1;
@@ -395,13 +395,13 @@ int sm750_hw_imageblit(struct lynx_accel *accel, const
char *src_buf,
/* Write MONO data (line by line) to 2D Engine data port */
for (i = 0; i < height; i++) {
/* For each line, send the data in chunks of 4 bytes */
- for (j = 0; j < (ul4BytesPerScan / 4); j++)
+ for (j = 0; j < (ul4_bytes_per_scan / 4); j++)
write_dp_port(accel, *(unsigned int *)(src_buf + (j *
4)));
- if (ulBytesRemain) {
- memcpy(ajRemain, src_buf + ul4BytesPerScan,
- ulBytesRemain);
- write_dp_port(accel, *(unsigned int *)ajRemain);
+ if (ul_bytes_remain) {
+ memcpy(aj_remain, src_buf + ul4_bytes_per_scan,
+ ul_bytes_remain);
+ write_dp_port(accel, *(unsigned int *)aj_remain);
}
src_buf += src_delta;
--
2.30.2
[PATCH v2 24/49] staging: sm750fb: Update local variable in sm750_hw_fillrect to snake case
Fix "Avoid CamelCase" checkpoint.pl checks for the local variable
deCtrl in the function sm750_hw_fillrect.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750_accel.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index c840873e9622..1eeedacfc4a8 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -90,7 +90,7 @@ int sm750_hw_fillrect(struct lynx_accel *accel,
u32 x, u32 y, u32 width, u32 height,
u32 color, u32 rop)
{
- u32 deCtrl;
+ u32 de_ctrl;
if (accel->de_wait() != 0) {
/*
@@ -122,11 +122,11 @@ int sm750_hw_fillrect(struct lynx_accel *accel,
((width << DE_DIMENSION_X_SHIFT) & DE_DIMENSION_X_MASK) |
(height & DE_DIMENSION_Y_ET_MASK)); /* dpr8 */
- deCtrl = DE_CONTROL_STATUS | DE_CONTROL_LAST_PIXEL |
+ de_ctrl = DE_CONTROL_STATUS | DE_CONTROL_LAST_PIXEL |
DE_CONTROL_COMMAND_RECTANGLE_FILL | DE_CONTROL_ROP_SELECT |
(rop & DE_CONTROL_ROP_MASK); /* dpr0xc */
- write_dpr(accel, DE_CONTROL, deCtrl);
+ write_dpr(accel, DE_CONTROL, de_ctrl);
return 0;
}
--
2.30.2
[PATCH v2 22/49] staging: sm750fb: Update local variable in sm750_hw_copyarea to snake case
Fix "Avoid CamelCase" checkpoint.pl checks for the local variable
nDirection in the function sm750_hw_copyarea.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750_accel.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index 4ad2814b5b54..760dd036d71a 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -153,9 +153,9 @@ int sm750_hw_copyarea(struct lynx_accel *accel,
unsigned int width, unsigned int height,
unsigned int rop2)
{
- unsigned int nDirection, de_ctrl;
+ unsigned int n_direction, de_ctrl;
- nDirection = LEFT_TO_RIGHT;
+ n_direction = LEFT_TO_RIGHT;
/* Direction of ROP2 operation: 1 = Left to Right, (-1) = Right to Left
*/
de_ctrl = 0;
@@ -173,7 +173,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel,
* +--+
*/
- nDirection = BOTTOM_TO_TOP;
+ n_direction = BOTTOM_TO_TOP;
} else if (sy > dy) {
/* +--+
* |D |
@@ -185,7 +185,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel,
* +--+
*/
- nDirection = TOP_TO_BOTTOM;
+ n_direction = TOP_TO_BOTTOM;
} else {
/* sy == dy */
@@ -198,7 +198,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel,
* +--+---+--+
*/
- nDirection = RIGHT_TO_LEFT;
+ n_direction = RIGHT_TO_LEFT;
} else {
/* sx > dx */
@@ -210,12 +210,12 @@ int sm750_hw_copyarea(struct lynx_accel *accel,
* +--+---+--+
*/
- nDirection = LEFT_TO_RIGHT;
+ n_direction = LEFT_TO_RIGHT;
}
}
}
- if ((nDirection == BOTTOM_TO_TOP) || (nDirection == RIGHT_TO_LEFT)) {
+ if ((n_direction == BOTTOM_TO_TOP) || (n_direction == RIGHT_TO_LEFT)) {
sx += width - 1;
sy += height - 1;
dx += width - 1;
@@ -277,7 +277,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel,
(height & DE_DIMENSION_Y_ET_MASK)); /* dpr08 */
de_ctrl = (rop2 & DE_CONTROL_ROP_MASK) | DE_CONTROL_ROP_SELECT |
- ((nDirection == RIGHT_TO_LEFT) ? DE_CONTROL_DIRECTION : 0) |
+ ((n_direction == RIGHT_TO_LEFT) ? DE_CONTROL_DIRECTION : 0) |
DE_CONTROL_COMMAND_BITBLT | DE_CONTROL_STATUS;
write_dpr(accel, DE_CONTROL, de_ctrl); /* dpr0c */
--
2.30.2
[PATCH v2 20/49] staging: sm750fb: Update function parameter names to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for function
parameter names in sm750_accel.c.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750_accel.c | 92 +--
1 file changed, 46 insertions(+), 46 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index 8faa601c700b..4327bda871e1 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -18,9 +18,9 @@
#include "sm750.h"
#include "sm750_accel.h"
-static inline void write_dpr(struct lynx_accel *accel, int offset, u32
regValue)
+static inline void write_dpr(struct lynx_accel *accel, int offset, u32
reg_value)
{
- writel(regValue, accel->dprBase + offset);
+ writel(reg_value, accel->dprBase + offset);
}
static inline u32 read_dpr(struct lynx_accel *accel, int offset)
@@ -86,7 +86,7 @@ void sm750_hw_set2dformat(struct lynx_accel *accel, int fmt)
}
int sm750_hw_fillrect(struct lynx_accel *accel,
- u32 base, u32 pitch, u32 Bpp,
+ u32 base, u32 pitch, u32 bpp,
u32 x, u32 y, u32 width, u32 height,
u32 color, u32 rop)
{
@@ -103,14 +103,14 @@ int sm750_hw_fillrect(struct lynx_accel *accel,
write_dpr(accel, DE_WINDOW_DESTINATION_BASE, base); /* dpr40 */
write_dpr(accel, DE_PITCH,
- ((pitch / Bpp << DE_PITCH_DESTINATION_SHIFT) &
+ ((pitch / bpp << DE_PITCH_DESTINATION_SHIFT) &
DE_PITCH_DESTINATION_MASK) |
- (pitch / Bpp & DE_PITCH_SOURCE_MASK)); /* dpr10 */
+ (pitch / bpp & DE_PITCH_SOURCE_MASK)); /* dpr10 */
write_dpr(accel, DE_WINDOW_WIDTH,
- ((pitch / Bpp << DE_WINDOW_WIDTH_DST_SHIFT) &
+ ((pitch / bpp << DE_WINDOW_WIDTH_DST_SHIFT) &
DE_WINDOW_WIDTH_DST_MASK) |
- (pitch / Bpp & DE_WINDOW_WIDTH_SRC_MASK)); /* dpr44 */
+ (pitch / bpp & DE_WINDOW_WIDTH_SRC_MASK)); /* dpr44 */
write_dpr(accel, DE_FOREGROUND, color); /* DPR14 */
@@ -132,13 +132,13 @@ int sm750_hw_fillrect(struct lynx_accel *accel,
/**
* sm750_hm_copyarea
- * @sBase: Address of source: offset in frame buffer
- * @sPitch: Pitch value of source surface in BYTE
+ * @s_base: Address of source: offset in frame buffer
+ * @s_pitch: Pitch value of source surface in BYTE
* @sx: Starting x coordinate of source surface
* @sy: Starting y coordinate of source surface
- * @dBase: Address of destination: offset in frame buffer
- * @dPitch: Pitch value of destination surface in BYTE
- * @Bpp: Color depth of destination surface
+ * @d_base: Address of destination: offset in frame buffer
+ * @d_pitch: Pitch value of destination surface in BYTE
+ * @bpp: Color depth of destination surface
* @dx: Starting x coordinate of destination surface
* @dy: Starting y coordinate of destination surface
* @width: width of rectangle in pixel value
@@ -146,10 +146,10 @@ int sm750_hw_fillrect(struct lynx_accel *accel,
* @rop2: ROP value
*/
int sm750_hw_copyarea(struct lynx_accel *accel,
- unsigned int sBase, unsigned int sPitch,
+ unsigned int s_base, unsigned int s_pitch,
unsigned int sx, unsigned int sy,
- unsigned int dBase, unsigned int dPitch,
- unsigned int Bpp, unsigned int dx, unsigned int dy,
+ unsigned int d_base, unsigned int d_pitch,
+ unsigned int bpp, unsigned int dx, unsigned int dy,
unsigned int width, unsigned int height,
unsigned int rop2)
{
@@ -160,7 +160,7 @@ int sm750_hw_copyarea(struct lynx_accel *accel,
de_ctrl = 0;
/* If source and destination are the same surface, need to check for
overlay cases */
- if (sBase == dBase && sPitch == dPitch) {
+ if (s_base == d_base && s_pitch == d_pitch) {
/* Determine direction of operation */
if (sy < dy) {
/* +--+
@@ -234,14 +234,14 @@ int sm750_hw_copyarea(struct lynx_accel *accel,
* It is an address offset (128 bit aligned)
* from the beginning of frame buffer.
*/
- write_dpr(accel, DE_WINDOW_SOURCE_BASE, sBase); /* dpr40 */
+ write_dpr(accel, DE_WINDOW_SOURCE_BASE, s_base); /* dpr40 */
/*
* 2D Destination Base.
* It is an address offset (128 bit aligned)
* from the beginning of frame buffer.
*/
- write_dpr(accel, DE_WINDOW_DESTINATION_BASE, dBase); /* dpr44 */
+ write_dpr(accel, DE_WINDOW_DESTINATION_BASE, d_base); /* dpr44 */
/*
* Program pitch (distance between the 1st points of two adjacent
lines).
[PATCH v2 21/49] staging: sm750fb: Rename function write_dpPort to snake case
Fix "Avoid CamelCase" checkpatch.pl check for the function
write_dpPort.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/sm750_accel.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index 4327bda871e1..4ad2814b5b54 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -28,7 +28,7 @@ static inline u32 read_dpr(struct lynx_accel *accel, int
offset)
return readl(accel->dprBase + offset);
}
-static inline void write_dpPort(struct lynx_accel *accel, u32 data)
+static inline void write_dp_port(struct lynx_accel *accel, u32 data)
{
writel(data, accel->dpPortBase);
}
@@ -396,12 +396,12 @@ int sm750_hw_imageblit(struct lynx_accel *accel, const
char *src_buf,
for (i = 0; i < height; i++) {
/* For each line, send the data in chunks of 4 bytes */
for (j = 0; j < (ul4BytesPerScan / 4); j++)
- write_dpPort(accel, *(unsigned int *)(src_buf + (j *
4)));
+ write_dp_port(accel, *(unsigned int *)(src_buf + (j *
4)));
if (ulBytesRemain) {
memcpy(ajRemain, src_buf + ul4BytesPerScan,
ulBytesRemain);
- write_dpPort(accel, *(unsigned int *)ajRemain);
+ write_dp_port(accel, *(unsigned int *)ajRemain);
}
src_buf += src_delta;
--
2.30.2
[PATCH v2 19/49] staging: sm750fb: Rename function parameter of sii164_enable_hot_plug_detection
Fix "Avoid CamelCase" checkpatch.pl check for the function parameter enable_hot_plug in the prototype of the function sii164_enable_hot_plug_detection. Signed-off-by: Pavle Rohalj --- drivers/staging/sm750fb/ddk750_sii164.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/sm750fb/ddk750_sii164.h b/drivers/staging/sm750fb/ddk750_sii164.h index ceafac60340f..ac1431dcb419 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.h +++ b/drivers/staging/sm750fb/ddk750_sii164.h @@ -34,7 +34,7 @@ unsigned short sii164_get_device_id(void); void sii164_reset_chip(void); char *sii164_get_chip_string(void); void sii164_set_power(unsigned char powerUp); -void sii164_enable_hot_plug_detection(unsigned char enableHotPlug); +void sii164_enable_hot_plug_detection(unsigned char enable_hot_plug); unsigned char sii164_is_connected(void); unsigned char sii164_check_interrupt(void); void sii164_clear_interrupt(void); -- 2.30.2
[PATCH v2 18/49] staging: sm750fb: Rename function params of sii164_init_chip
Fix "Avoid CamelCase" checkpatch.pl checks for function parameter
names of the function sii164_init_chip.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_sii164.h | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_sii164.h
b/drivers/staging/sm750fb/ddk750_sii164.h
index cf17b9029496..ceafac60340f 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.h
+++ b/drivers/staging/sm750fb/ddk750_sii164.h
@@ -16,16 +16,16 @@ enum sii164_hot_plug_mode {
};
/* Silicon Image SiI164 chip prototype */
-long sii164_init_chip(unsigned char edgeSelect,
- unsigned char busSelect,
- unsigned char dualEdgeClkSelect,
- unsigned char hsyncEnable,
- unsigned char vsyncEnable,
- unsigned char deskewEnable,
- unsigned char deskewSetting,
- unsigned char continuousSyncEnable,
- unsigned char pllFilterEnable,
- unsigned char pllFilterValue);
+long sii164_init_chip(unsigned char edge_select,
+ unsigned char bus_select,
+ unsigned char dual_edge_clk_select,
+ unsigned char hsync_enable,
+ unsigned char vsync_enable,
+ unsigned char deskew_enable,
+ unsigned char deskew_setting,
+ unsigned char continuous_sync_enable,
+ unsigned char pll_filter_enable,
+ unsigned char pll_filter_value);
unsigned short sii164_get_vendor_id(void);
unsigned short sii164_get_device_id(void);
--
2.30.2
[PATCH v2 17/49] staging: sm750fb: Rename local variables to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for local
variables in SII164_FULL_FUNCTIONS block.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_sii164.c | 40 -
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index 869d74f53a6a..758a118e4421 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -304,28 +304,28 @@ void sii164_set_power(unsigned char power_up)
static
void sii164_select_hot_plug_detection_mode(enum sii164_hot_plug_mode
hot_plug_mode)
{
- unsigned char detectReg;
+ unsigned char detect_reg;
- detectReg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) &
+ detect_reg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) &
~SII164_DETECT_MONITOR_SENSE_OUTPUT_FLAG;
switch (hot_plug_mode) {
case SII164_HOTPLUG_DISABLE:
- detectReg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_HIGH;
+ detect_reg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_HIGH;
break;
case SII164_HOTPLUG_USE_MDI:
- detectReg &= ~SII164_DETECT_INTERRUPT_MASK;
- detectReg |= SII164_DETECT_INTERRUPT_BY_HTPLG_PIN;
- detectReg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_MDI;
+ detect_reg &= ~SII164_DETECT_INTERRUPT_MASK;
+ detect_reg |= SII164_DETECT_INTERRUPT_BY_HTPLG_PIN;
+ detect_reg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_MDI;
break;
case SII164_HOTPLUG_USE_RSEN:
- detectReg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_RSEN;
+ detect_reg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_RSEN;
break;
case SII164_HOTPLUG_USE_HTPLG:
- detectReg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_HTPLG;
+ detect_reg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_HTPLG;
break;
}
- i2c_write_reg(SII164_I2C_ADDRESS, SII164_DETECT, detectReg);
+ i2c_write_reg(SII164_I2C_ADDRESS, SII164_DETECT, detect_reg);
}
/*
@@ -336,9 +336,9 @@ void sii164_select_hot_plug_detection_mode(enum
sii164_hot_plug_mode hot_plug_mo
*/
void sii164_enable_hot_plug_detection(unsigned char enable_hot_plug)
{
- unsigned char detectReg;
+ unsigned char detect_reg;
- detectReg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT);
+ detect_reg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT);
/* Depending on each DVI controller, need to enable the hot plug based
* on each individual chip design.
@@ -359,11 +359,11 @@ void sii164_enable_hot_plug_detection(unsigned char
enable_hot_plug)
*/
unsigned char sii164_is_connected(void)
{
- unsigned char hotPlugValue;
+ unsigned char hot_plug_value;
- hotPlugValue = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) &
+ hot_plug_value = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) &
SII164_DETECT_HOT_PLUG_STATUS_MASK;
- if (hotPlugValue == SII164_DETECT_HOT_PLUG_STATUS_ON)
+ if (hot_plug_value == SII164_DETECT_HOT_PLUG_STATUS_ON)
return 1;
else
return 0;
@@ -379,11 +379,11 @@ unsigned char sii164_is_connected(void)
*/
unsigned char sii164_check_interrupt(void)
{
- unsigned char detectReg;
+ unsigned char detect_reg;
- detectReg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) &
+ detect_reg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) &
SII164_DETECT_MONITOR_STATE_MASK;
- if (detectReg == SII164_DETECT_MONITOR_STATE_CHANGE)
+ if (detect_reg == SII164_DETECT_MONITOR_STATE_CHANGE)
return 1;
else
return 0;
@@ -395,12 +395,12 @@ unsigned char sii164_check_interrupt(void)
*/
void sii164_clear_interrupt(void)
{
- unsigned char detectReg;
+ unsigned char detect_reg;
/* Clear the MDI interrupt */
- detectReg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT);
+ detect_reg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT);
i2c_write_reg(SII164_I2C_ADDRESS, SII164_DETECT,
- detectReg | SII164_DETECT_MONITOR_STATE_CLEAR);
+ detect_reg | SII164_DETECT_MONITOR_STATE_CLEAR);
}
#endif
--
2.30.2
[PATCH v2 16/49] staging: sm750fb: Update function parameter names in ddk750_sii164.c
Fix "Avoid CamelCase" checkpatch.pl checks for function
parameters in ddk750_sii164.c.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_sii164.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index a7e0f001d96f..869d74f53a6a 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -277,14 +277,14 @@ char *sii164_get_chip_string(void)
* This function sets the power configuration of the DVI Controller Chip.
*
* Input:
- * powerUp - Flag to set the power down or up
+ * power_up - Flag to set the power down or up
*/
-void sii164_set_power(unsigned char powerUp)
+void sii164_set_power(unsigned char power_up)
{
unsigned char config;
config = i2c_read_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION);
- if (powerUp == 1) {
+ if (power_up == 1) {
/* Power up the chip */
config &= ~SII164_CONFIGURATION_POWER_MASK;
config |= SII164_CONFIGURATION_POWER_NORMAL;
@@ -302,13 +302,13 @@ void sii164_set_power(unsigned char powerUp)
* This function selects the mode of the hot plug detection.
*/
static
-void sii164_select_hot_plug_detection_mode(enum sii164_hot_plug_mode
hotPlugMode)
+void sii164_select_hot_plug_detection_mode(enum sii164_hot_plug_mode
hot_plug_mode)
{
unsigned char detectReg;
detectReg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) &
~SII164_DETECT_MONITOR_SENSE_OUTPUT_FLAG;
- switch (hotPlugMode) {
+ switch (hot_plug_mode) {
case SII164_HOTPLUG_DISABLE:
detectReg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_HIGH;
break;
@@ -332,9 +332,9 @@ void sii164_select_hot_plug_detection_mode(enum
sii164_hot_plug_mode hotPlugMode
* sii164_enable_hot_plug_detection
* This function enables the Hot Plug detection.
*
- * enableHotPlug - Enable (=1) / disable (=0) Hot Plug detection
+ * enable_hot_plug - Enable (=1) / disable (=0) Hot Plug detection
*/
-void sii164_enable_hot_plug_detection(unsigned char enableHotPlug)
+void sii164_enable_hot_plug_detection(unsigned char enable_hot_plug)
{
unsigned char detectReg;
@@ -343,7 +343,7 @@ void sii164_enable_hot_plug_detection(unsigned char
enableHotPlug)
/* Depending on each DVI controller, need to enable the hot plug based
* on each individual chip design.
*/
- if (enableHotPlug != 0)
+ if (enable_hot_plug != 0)
sii164_select_hot_plug_detection_mode(SII164_HOTPLUG_USE_MDI);
else
sii164_select_hot_plug_detection_mode(SII164_HOTPLUG_DISABLE);
--
2.30.2
[PATCH v2 15/49] staging: sm750fb: Rename gDviCtrlChipName to snake case
Fix "Avoid CamelCase" checkpatch.pl check for the
global variable gDviCtrlChipName.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_sii164.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index 7e0a481970f5..a7e0f001d96f 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -25,7 +25,7 @@
#ifdef SII164_FULL_FUNCTIONS
/* Name of the DVI Controller chip */
-static char *gDviCtrlChipName = "Silicon Image SiI 164";
+static char *dvi_ctrl_chip_name = "Silicon Image SiI 164";
#endif
/*
@@ -269,7 +269,7 @@ void sii164_reset_chip(void)
*/
char *sii164_get_chip_string(void)
{
- return gDviCtrlChipName;
+ return dvi_ctrl_chip_name;
}
/*
--
2.30.2
[PATCH v2 14/49] staging: sm750fb: Rename sii164SelectHotPlugDetectionMode to snake case
Fix "Avoid CamelCase" checkpatch.pl check for the function
sii164SelectHotPlugDetectionMode in ddk750_sii164.c.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_sii164.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index ceeb914f8441..7e0a481970f5 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -298,11 +298,11 @@ void sii164_set_power(unsigned char powerUp)
}
/*
- * sii164SelectHotPlugDetectionMode
+ * sii164_select_hot_plug_detection_mode
* This function selects the mode of the hot plug detection.
*/
static
-void sii164SelectHotPlugDetectionMode(enum sii164_hot_plug_mode hotPlugMode)
+void sii164_select_hot_plug_detection_mode(enum sii164_hot_plug_mode
hotPlugMode)
{
unsigned char detectReg;
@@ -344,9 +344,9 @@ void sii164_enable_hot_plug_detection(unsigned char
enableHotPlug)
* on each individual chip design.
*/
if (enableHotPlug != 0)
- sii164SelectHotPlugDetectionMode(SII164_HOTPLUG_USE_MDI);
+ sii164_select_hot_plug_detection_mode(SII164_HOTPLUG_USE_MDI);
else
- sii164SelectHotPlugDetectionMode(SII164_HOTPLUG_DISABLE);
+ sii164_select_hot_plug_detection_mode(SII164_HOTPLUG_DISABLE);
}
/*
--
2.30.2
[PATCH v2 12/49] staging: sm750fb: Rename vendorID local variable to snake case
Fix "Avoid CamelCase" checkpatch.pl check for the local
variable vendorID in the function sii164_get_vendor_id.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_sii164.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index af14273b99eb..14d7083775b4 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -37,14 +37,14 @@ static char *gDviCtrlChipName = "Silicon Image SiI 164";
*/
unsigned short sii164_get_vendor_id(void)
{
- unsigned short vendorID;
+ unsigned short vendor_id;
- vendorID = ((unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
+ vendor_id = ((unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
SII164_VENDOR_ID_HIGH) << 8) |
(unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
SII164_VENDOR_ID_LOW);
- return vendorID;
+ return vendor_id;
}
/*
--
2.30.2
[PATCH v2 13/49] staging: sm750fb: Rename deviceID local variable to snake case
Fix "Avoid CamelCase" checkpatch.pl check for the local
variable deviceID in the function sii164_get_device_id.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_sii164.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index 14d7083775b4..ceeb914f8441 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -56,14 +56,14 @@ unsigned short sii164_get_vendor_id(void)
*/
unsigned short sii164_get_device_id(void)
{
- unsigned short deviceID;
+ unsigned short device_id;
- deviceID = ((unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
+ device_id = ((unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
SII164_DEVICE_ID_HIGH) << 8) |
(unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
SII164_DEVICE_ID_LOW);
- return deviceID;
+ return device_id;
}
/*
--
2.30.2
[PATCH v2 11/49] staging: sm750fb: Rename i2cWriteReg and i2cReadReg to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for i2cWriteReg
and i2cReadReg in ddk750_sii164.c.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_sii164.c | 46 -
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index 6c343e2e0433..af14273b99eb 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -12,11 +12,11 @@
#define USE_HW_I2C
#ifdef USE_HW_I2C
-#define i2cWriteReg sm750_hw_i2c_write_reg
-#define i2cReadReg sm750_hw_i2c_read_reg
+#define i2c_write_reg sm750_hw_i2c_write_reg
+#define i2c_read_reg sm750_hw_i2c_read_reg
#else
-#define i2cWriteReg sm750_sw_i2c_write_reg
-#define i2cReadReg sm750_sw_i2c_read_reg
+#define i2c_write_reg sm750_sw_i2c_write_reg
+#define i2c_read_reg sm750_sw_i2c_read_reg
#endif
/* SII164 Vendor and Device ID */
@@ -39,9 +39,9 @@ unsigned short sii164_get_vendor_id(void)
{
unsigned short vendorID;
- vendorID = ((unsigned short)i2cReadReg(SII164_I2C_ADDRESS,
+ vendorID = ((unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
SII164_VENDOR_ID_HIGH) << 8) |
- (unsigned short)i2cReadReg(SII164_I2C_ADDRESS,
+ (unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
SII164_VENDOR_ID_LOW);
return vendorID;
@@ -58,9 +58,9 @@ unsigned short sii164_get_device_id(void)
{
unsigned short deviceID;
- deviceID = ((unsigned short)i2cReadReg(SII164_I2C_ADDRESS,
+ deviceID = ((unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
SII164_DEVICE_ID_HIGH) << 8) |
- (unsigned short)i2cReadReg(SII164_I2C_ADDRESS,
+ (unsigned short)i2c_read_reg(SII164_I2C_ADDRESS,
SII164_DEVICE_ID_LOW);
return deviceID;
@@ -176,7 +176,7 @@ long sii164_init_chip(unsigned char edge_select,
else
config |= SII164_CONFIGURATION_VSYNC_AS_IS;
- i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);
+ i2c_write_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);
/*
* De-skew enabled with default 111b value.
@@ -214,7 +214,7 @@ long sii164_init_chip(unsigned char edge_select,
config |= SII164_DESKEW_8_STEP;
break;
}
- i2cWriteReg(SII164_I2C_ADDRESS, SII164_DESKEW, config);
+ i2c_write_reg(SII164_I2C_ADDRESS, SII164_DESKEW, config);
/* Enable/Disable Continuous Sync. */
if (continuous_sync_enable == 0)
@@ -231,12 +231,12 @@ long sii164_init_chip(unsigned char edge_select,
/* Set the PLL Filter value */
config |= ((pll_filter_value & 0x07) << 1);
- i2cWriteReg(SII164_I2C_ADDRESS, SII164_PLL, config);
+ i2c_write_reg(SII164_I2C_ADDRESS, SII164_PLL, config);
/* Recover from Power Down and enable output. */
- config = i2cReadReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION);
+ config = i2c_read_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION);
config |= SII164_CONFIGURATION_POWER_NORMAL;
- i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);
+ i2c_write_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);
return 0;
}
@@ -283,17 +283,17 @@ void sii164_set_power(unsigned char powerUp)
{
unsigned char config;
- config = i2cReadReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION);
+ config = i2c_read_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION);
if (powerUp == 1) {
/* Power up the chip */
config &= ~SII164_CONFIGURATION_POWER_MASK;
config |= SII164_CONFIGURATION_POWER_NORMAL;
- i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);
+ i2c_write_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);
} else {
/* Power down the chip */
config &= ~SII164_CONFIGURATION_POWER_MASK;
config |= SII164_CONFIGURATION_POWER_DOWN;
- i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);
+ i2c_write_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);
}
}
@@ -306,7 +306,7 @@ void sii164SelectHotPlugDetectionMode(enum
sii164_hot_plug_mode hotPlugMode)
{
unsigned char detectReg;
- detectReg = i2cReadReg(SII164_I2C_ADDRESS, SII164_DETECT) &
+ detectReg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) &
~SII164_
[PATCH v2 10/49] staging: sm750fb: Rename ddk750_setModeTiming to ddk750_set_mode_timing
Fix "Avoid CamelCase" checkpatch.pl check for the function
ddk750_setModeTiming.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_mode.c | 2 +-
drivers/staging/sm750fb/ddk750_mode.h | 2 +-
drivers/staging/sm750fb/sm750_hw.c| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_mode.c
b/drivers/staging/sm750fb/ddk750_mode.c
index 5c685b4e2fd6..2548695829ec 100644
--- a/drivers/staging/sm750fb/ddk750_mode.c
+++ b/drivers/staging/sm750fb/ddk750_mode.c
@@ -207,7 +207,7 @@ static int program_mode_registers(struct mode_parameter
*mode_param,
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;
diff --git a/drivers/staging/sm750fb/ddk750_mode.h
b/drivers/staging/sm750fb/ddk750_mode.h
index 2df78a0937b2..1b70885f85e5 100644
--- a/drivers/staging/sm750fb/ddk750_mode.h
+++ b/drivers/staging/sm750fb/ddk750_mode.h
@@ -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
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index 7136d751cff5..e31f4c6bc69e 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -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(, clock);
+ ret = ddk750_set_mode_timing(, clock);
if (ret) {
pr_err("Set mode timing failed\n");
goto exit;
--
2.30.2
[PATCH v2 09/49] staging: sm750fb: Rename sm750_set_power_mode function parameter
Fix "Avoid CamelCase" checkpatch.pl check for the function parameter
powerMode of function sm750_set_power_mode.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_power.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/sm750fb/ddk750_power.h
b/drivers/staging/sm750fb/ddk750_power.h
index 4756db1ccb9c..d43942d6a5aa 100644
--- a/drivers/staging/sm750fb/ddk750_power.h
+++ b/drivers/staging/sm750fb/ddk750_power.h
@@ -15,7 +15,7 @@ enum dpms {
}
void ddk750_set_dpms(enum dpms state);
-void sm750_set_power_mode(unsigned int powerMode);
+void sm750_set_power_mode(unsigned int power_mode);
void sm750_set_current_gate(unsigned int gate);
/*
--
2.30.2
[PATCH v2 08/49] staging: sm750fb: Update enum values in dpms to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for values in
enum dpms.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_power.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_power.h
b/drivers/staging/sm750fb/ddk750_power.h
index 7002567a47d2..4756db1ccb9c 100644
--- a/drivers/staging/sm750fb/ddk750_power.h
+++ b/drivers/staging/sm750fb/ddk750_power.h
@@ -3,10 +3,10 @@
#define DDK750_POWER_H__
enum dpms {
- crtDPMS_ON = 0x0,
- crtDPMS_STANDBY = 0x1,
- crtDPMS_SUSPEND = 0x2,
- crtDPMS_OFF = 0x3,
+ CRT_DPMS_ON = 0x0,
+ CRT_DPMS_STANDBY = 0x1,
+ CRT_DPMS_SUSPEND = 0x2,
+ CRT_DPMS_OFF = 0x3,
};
#define set_DAC(off) { \
--
2.30.2
[PATCH v2 06/49] staging: sm750fb: Update displayControlAdjust_SM750LE to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for the function
displayControlAdjust_SM750LE, including its name, parameters, and body.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_mode.c | 40 +--
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_mode.c
b/drivers/staging/sm750fb/ddk750_mode.c
index e00a6cb31947..2fae81b47f46 100644
--- a/drivers/staging/sm750fb/ddk750_mode.c
+++ b/drivers/staging/sm750fb/ddk750_mode.c
@@ -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
@@ -36,42 +36,42 @@ displayControlAdjust_SM750LE(struct mode_parameter
*pModeParam,
((x - 1) & CRT_AUTO_CENTERING_BR_RIGHT_MASK));
/*
-* Assume common fields in dispControl have been properly set before
+* Assume common fields in disp_control have been properly set before
* calling this function.
-* This function only sets the extra fields in dispControl.
+* This function only sets the extra fields in disp_control.
*/
/* 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 */
@@ -125,7 +125,7 @@ static int programModeRegisters(struct mode_parameter
*pModeParam,
tmp |= DISPLAY_CTRL_HSYNC_PHASE;
if (sm750_get_chip_type() == SM750LE) {
- displayControlAdjust_SM750LE(pModeParam, tmp);
+ display_control_adjust_sm750le(pModeParam, tmp);
} else {
reg = peek32(CRT_DISPLAY_CTRL) &
~(DISPLAY_CTRL_VSYNC_PHASE |
--
2.30.2
[PATCH v2 07/49] staging: sm750fb: Update programModeRegisters to snake case
Fix "Avoid CamelCase" checkpatch.pl check for the function
programModeRegisters, including its name, parameters, and body.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_mode.c | 48 +--
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_mode.c
b/drivers/staging/sm750fb/ddk750_mode.c
index 2fae81b47f46..5c685b4e2fd6 100644
--- a/drivers/staging/sm750fb/ddk750_mode.c
+++ b/drivers/staging/sm750fb/ddk750_mode.c
@@ -75,7 +75,7 @@ display_control_adjust_sm750le(struct mode_parameter
*mode_param,
}
/* only timing related registers will be programed */
-static int programModeRegisters(struct mode_parameter *pModeParam,
+static int program_mode_registers(struct mode_parameter *mode_param,
struct pll_value *pll)
{
int ret = 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) {
- display_control_adjust_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
[PATCH v2 05/49] staging: sm750fb: Remove remaining camel case names in ddk750_dvi.h
Fix "Avoid CamelCase" checkpatch.pl check for type definitions DVICTRL_SETPOWER and DVICTRL_HOTPLUGDETECTION in ddk750_dvi.h. Signed-off-by: Pavle Rohalj --- drivers/staging/sm750fb/ddk750_dvi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/sm750fb/ddk750_dvi.h b/drivers/staging/sm750fb/ddk750_dvi.h index 8aee0cdf63a4..d953fb5ab9f2 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.h +++ b/drivers/staging/sm750fb/ddk750_dvi.h @@ -19,8 +19,8 @@ typedef void (*DVICTRL_RESETCHIP)(void); typedef char* (*DVICTRL_GETCHIPSTRING)(void); typedef unsigned short (*DVICTRL_GETVENDORID)(void); typedef unsigned short (*DVICTRL_GETDEVICEID)(void); -typedef void (*DVICTRL_SETPOWER)(unsigned char powerUp); -typedef void (*DVICTRL_HOTPLUGDETECTION)(unsigned char enableHotPlug); +typedef void (*DVICTRL_SETPOWER)(unsigned char power_up); +typedef void (*DVICTRL_HOTPLUGDETECTION)(unsigned char enable_hot_plug); typedef unsigned char (*DVICTRL_ISCONNECTED)(void); typedef unsigned char (*DVICTRL_CHECKINTERRUPT)(void); typedef void (*DVICTRL_CLEARINTERRUPT)(void); -- 2.30.2
[PATCH v2 03/49] staging: sm750fb: Update param names of PFN_DVICTRL_INIT function pointer
Fix "Avoid CamelCase" checkpatch.pl checks for parameter names in the type definition of PFN_DVICTRL_INIT function pointer. Signed-off-by: Pavle Rohalj --- drivers/staging/sm750fb/ddk750_dvi.h | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/sm750fb/ddk750_dvi.h b/drivers/staging/sm750fb/ddk750_dvi.h index fbc897c7efb8..b2fd56ef51fc 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.h +++ b/drivers/staging/sm750fb/ddk750_dvi.h @@ -4,16 +4,16 @@ /* dvi chip stuffs structros */ -typedef long (*PFN_DVICTRL_INIT)(unsigned char edgeSelect, -unsigned char busSelect, -unsigned char dualEdgeClkSelect, -unsigned char hsyncEnable, -unsigned char vsyncEnable, -unsigned char deskewEnable, -unsigned char deskewSetting, -unsigned char continuousSyncEnable, -unsigned char pllFilterEnable, -unsigned char pllFilterValue); +typedef long (*PFN_DVICTRL_INIT)(unsigned char edge_select, +unsigned char bus_select, +unsigned char dual_edge_clk_select, +unsigned char hsync_enable, +unsigned char vsync_enable, +unsigned char deskew_enable, +unsigned char deskew_setting, +unsigned char continuous_sync_enable, +unsigned char pll_filter_enable, +unsigned char pll_filter_value); typedef void (*PFN_DVICTRL_RESETCHIP)(void); typedef char* (*PFN_DVICTRL_GETCHIPSTRING)(void); -- 2.30.2
[PATCH v2 04/49] staging: sm750fb: Remove type names in variables and type definitions
Remove type names used in variables and type definitions for
dvi_ctrl_device structure.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_dvi.c | 24 -
drivers/staging/sm750fb/ddk750_dvi.h | 40 ++--
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
b/drivers/staging/sm750fb/ddk750_dvi.c
index 943cbcafcffa..2743778abaab 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -14,17 +14,17 @@
static struct dvi_ctrl_device dcft_supported_dvi_controller[] = {
#ifdef DVI_CTRL_SII164
{
- .pfn_init = sii164_init_chip,
- .pfn_get_vendor_id = sii164_get_vendor_id,
- .pfn_get_device_id = sii164_get_device_id,
+ .init = sii164_init_chip,
+ .get_vendor_id = sii164_get_vendor_id,
+ .get_device_id = sii164_get_device_id,
#ifdef SII164_FULL_FUNCTIONS
- .pfn_reset_chip = sii164_reset_chip,
- .pfn_get_chip_string = sii164_get_chip_string,
- .pfn_set_power = sii164_set_power,
- .pfn_enable_hot_plug_detection =
sii164_enable_hot_plug_detection,
- .pfn_is_connected = sii164_is_connected,
- .pfn_check_interrupt = sii164_check_interrupt,
- .pfn_clear_interrupt = sii164_clear_interrupt,
+ .reset_chip = sii164_reset_chip,
+ .get_chip_string = sii164_get_chip_string,
+ .set_power = sii164_set_power,
+ .enable_hot_plug_detection = sii164_enable_hot_plug_detection,
+ .is_connected = sii164_is_connected,
+ .check_interrupt = sii164_check_interrupt,
+ .clear_interrupt = sii164_clear_interrupt,
#endif
},
#endif
@@ -44,8 +44,8 @@ int dvi_init(unsigned char edge_select,
struct dvi_ctrl_device *current_dvi_ctrl;
current_dvi_ctrl = dcft_supported_dvi_controller;
- if (current_dvi_ctrl->pfn_init) {
- return current_dvi_ctrl->pfn_init(edge_select,
+ if (current_dvi_ctrl->init) {
+ return current_dvi_ctrl->init(edge_select,
bus_select,
dual_edge_clk_select,
hsync_enable,
diff --git a/drivers/staging/sm750fb/ddk750_dvi.h
b/drivers/staging/sm750fb/ddk750_dvi.h
index b2fd56ef51fc..8aee0cdf63a4 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.h
+++ b/drivers/staging/sm750fb/ddk750_dvi.h
@@ -4,7 +4,7 @@
/* dvi chip stuffs structros */
-typedef long (*PFN_DVICTRL_INIT)(unsigned char edge_select,
+typedef long (*DVICTRL_INIT)(unsigned char edge_select,
unsigned char bus_select,
unsigned char dual_edge_clk_select,
unsigned char hsync_enable,
@@ -15,28 +15,28 @@ typedef long (*PFN_DVICTRL_INIT)(unsigned char edge_select,
unsigned char pll_filter_enable,
unsigned char pll_filter_value);
-typedef void (*PFN_DVICTRL_RESETCHIP)(void);
-typedef char* (*PFN_DVICTRL_GETCHIPSTRING)(void);
-typedef unsigned short (*PFN_DVICTRL_GETVENDORID)(void);
-typedef unsigned short (*PFN_DVICTRL_GETDEVICEID)(void);
-typedef void (*PFN_DVICTRL_SETPOWER)(unsigned char powerUp);
-typedef void (*PFN_DVICTRL_HOTPLUGDETECTION)(unsigned char enableHotPlug);
-typedef unsigned char (*PFN_DVICTRL_ISCONNECTED)(void);
-typedef unsigned char (*PFN_DVICTRL_CHECKINTERRUPT)(void);
-typedef void (*PFN_DVICTRL_CLEARINTERRUPT)(void);
+typedef void (*DVICTRL_RESETCHIP)(void);
+typedef char* (*DVICTRL_GETCHIPSTRING)(void);
+typedef unsigned short (*DVICTRL_GETVENDORID)(void);
+typedef unsigned short (*DVICTRL_GETDEVICEID)(void);
+typedef void (*DVICTRL_SETPOWER)(unsigned char powerUp);
+typedef void (*DVICTRL_HOTPLUGDETECTION)(unsigned char enableHotPlug);
+typedef unsigned char (*DVICTRL_ISCONNECTED)(void);
+typedef unsigned char (*DVICTRL_CHECKINTERRUPT)(void);
+typedef void (*DVICTRL_CLEARINTERRUPT)(void);
/* Structure to hold all the function pointer to the DVI Controller. */
struct dvi_ctrl_device {
- PFN_DVICTRL_INITpfn_init;
- PFN_DVICTRL_RESETCHIP pfn_reset_chip;
- PFN_DVICTRL_GETCHIPSTRING pfn_get_chip_string;
- PFN_DVICTRL_GETVENDORID pfn_get_vendor_id;
- PFN_DVICTRL_GETDEVICEID pfn_get_device_id;
- PFN_DVICTRL_SETPOWERpfn_set_power;
- PFN_DVICTRL_HOTPLUGDETECTIONpfn_enable_hot_plug_detection;
- PFN_DVICTRL_ISCONNECTED pfn_is_connected;
- PFN_DVICTRL_CHECKINTERRUPT pfn_check_interrupt;
- PFN_DVICTRL_CLEARINTERRUPT pfn_clear_interrupt;
+ DVICTRL_INITinit;
+ DVICT
[PATCH v2 02/49] staging: sm750fb: Rename dviInit to dvi_init and update param names
Fix "Avoid CamelCase" checkpatch.pl checks for the function dviInit and
its parameter names in ddk750_dvi.h.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_dvi.c | 2 +-
drivers/staging/sm750fb/ddk750_dvi.h | 20 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
b/drivers/staging/sm750fb/ddk750_dvi.c
index db19bf732482..943cbcafcffa 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -30,7 +30,7 @@ static struct dvi_ctrl_device dcft_supported_dvi_controller[]
= {
#endif
};
-int dviInit(unsigned char edge_select,
+int dvi_init(unsigned char edge_select,
unsigned char bus_select,
unsigned char dual_edge_clk_select,
unsigned char hsync_enable,
diff --git a/drivers/staging/sm750fb/ddk750_dvi.h
b/drivers/staging/sm750fb/ddk750_dvi.h
index 4ca2591ea94b..fbc897c7efb8 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.h
+++ b/drivers/staging/sm750fb/ddk750_dvi.h
@@ -42,16 +42,16 @@ struct dvi_ctrl_device {
#define DVI_CTRL_SII164
/* dvi functions prototype */
-int dviInit(unsigned char edgeSelect,
- unsigned char busSelect,
- unsigned char dualEdgeClkSelect,
- unsigned char hsyncEnable,
- unsigned char vsyncEnable,
- unsigned char deskewEnable,
- unsigned char deskewSetting,
- unsigned char continuousSyncEnable,
- unsigned char pllFilterEnable,
- unsigned char pllFilterValue);
+int dvi_init(unsigned char edge_select,
+ unsigned char bus_select,
+ unsigned char dual_edge_clk_select,
+ unsigned char hsync_enable,
+ unsigned char vsync_enable,
+ unsigned char deskew_enable,
+ unsigned char deskew_setting,
+ unsigned char continuous_sync_enable,
+ unsigned char pll_filter_enable,
+ unsigned char pll_filter_value);
#endif
--
2.30.2
[PATCH v2 01/49] staging: sm750fb: Update dvi_ctrl_device to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for dvi_ctrl_device structure and
its usages.
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_dvi.c| 30
drivers/staging/sm750fb/ddk750_dvi.h| 20 +--
drivers/staging/sm750fb/ddk750_sii164.c | 48 -
drivers/staging/sm750fb/ddk750_sii164.h | 20 +--
4 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
b/drivers/staging/sm750fb/ddk750_dvi.c
index cd564ea40779..db19bf732482 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -11,20 +11,20 @@
* function API. Please set the function pointer to NULL whenever the function
* is not supported.
*/
-static struct dvi_ctrl_device g_dcftSupportedDviController[] = {
+static struct dvi_ctrl_device dcft_supported_dvi_controller[] = {
#ifdef DVI_CTRL_SII164
{
- .pfnInit = sii164InitChip,
- .pfnGetVendorId = sii164GetVendorID,
- .pfnGetDeviceId = sii164GetDeviceID,
+ .pfn_init = sii164_init_chip,
+ .pfn_get_vendor_id = sii164_get_vendor_id,
+ .pfn_get_device_id = sii164_get_device_id,
#ifdef SII164_FULL_FUNCTIONS
- .pfnResetChip = sii164ResetChip,
- .pfnGetChipString = sii164GetChipString,
- .pfnSetPower = sii164SetPower,
- .pfnEnableHotPlugDetection = sii164EnableHotPlugDetection,
- .pfnIsConnected = sii164IsConnected,
- .pfnCheckInterrupt = sii164CheckInterrupt,
- .pfnClearInterrupt = sii164ClearInterrupt,
+ .pfn_reset_chip = sii164_reset_chip,
+ .pfn_get_chip_string = sii164_get_chip_string,
+ .pfn_set_power = sii164_set_power,
+ .pfn_enable_hot_plug_detection =
sii164_enable_hot_plug_detection,
+ .pfn_is_connected = sii164_is_connected,
+ .pfn_check_interrupt = sii164_check_interrupt,
+ .pfn_clear_interrupt = sii164_clear_interrupt,
#endif
},
#endif
@@ -41,11 +41,11 @@ int dviInit(unsigned char edge_select,
unsigned char pll_filter_enable,
unsigned char pll_filter_value)
{
- struct dvi_ctrl_device *pCurrentDviCtrl;
+ struct dvi_ctrl_device *current_dvi_ctrl;
- pCurrentDviCtrl = g_dcftSupportedDviController;
- if (pCurrentDviCtrl->pfnInit) {
- return pCurrentDviCtrl->pfnInit(edge_select,
+ current_dvi_ctrl = dcft_supported_dvi_controller;
+ if (current_dvi_ctrl->pfn_init) {
+ return current_dvi_ctrl->pfn_init(edge_select,
bus_select,
dual_edge_clk_select,
hsync_enable,
diff --git a/drivers/staging/sm750fb/ddk750_dvi.h
b/drivers/staging/sm750fb/ddk750_dvi.h
index 1c7a565b617a..4ca2591ea94b 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.h
+++ b/drivers/staging/sm750fb/ddk750_dvi.h
@@ -27,16 +27,16 @@ typedef void (*PFN_DVICTRL_CLEARINTERRUPT)(void);
/* Structure to hold all the function pointer to the DVI Controller. */
struct dvi_ctrl_device {
- PFN_DVICTRL_INITpfnInit;
- PFN_DVICTRL_RESETCHIP pfnResetChip;
- PFN_DVICTRL_GETCHIPSTRING pfnGetChipString;
- PFN_DVICTRL_GETVENDORID pfnGetVendorId;
- PFN_DVICTRL_GETDEVICEID pfnGetDeviceId;
- PFN_DVICTRL_SETPOWERpfnSetPower;
- PFN_DVICTRL_HOTPLUGDETECTIONpfnEnableHotPlugDetection;
- PFN_DVICTRL_ISCONNECTED pfnIsConnected;
- PFN_DVICTRL_CHECKINTERRUPT pfnCheckInterrupt;
- PFN_DVICTRL_CLEARINTERRUPT pfnClearInterrupt;
+ PFN_DVICTRL_INITpfn_init;
+ PFN_DVICTRL_RESETCHIP pfn_reset_chip;
+ PFN_DVICTRL_GETCHIPSTRING pfn_get_chip_string;
+ PFN_DVICTRL_GETVENDORID pfn_get_vendor_id;
+ PFN_DVICTRL_GETDEVICEID pfn_get_device_id;
+ PFN_DVICTRL_SETPOWERpfn_set_power;
+ PFN_DVICTRL_HOTPLUGDETECTIONpfn_enable_hot_plug_detection;
+ PFN_DVICTRL_ISCONNECTED pfn_is_connected;
+ PFN_DVICTRL_CHECKINTERRUPT pfn_check_interrupt;
+ PFN_DVICTRL_CLEARINTERRUPT pfn_clear_interrupt;
};
#define DVI_CTRL_SII164
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index 73e0e9f41ec5..6c343e2e0433 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -29,13 +29,13 @@ static char *gDviCtrlChipName = "Silicon Image SiI 164";
#endif
/*
- * sii164GetVendorID
+ * sii164_get_vendor_id
* This function gets the vendor ID of the DVI controller chip.
*
* Output:
* Vendor ID
*/
-unsig
[PATCH v2 00/49] *** SUBJECT HERE ***
Changes in v2: - Removed type information from variable names - Broken up the changes into smaller patches Pavle Rohalj (49): staging: sm750fb: Update dvi_ctrl_device to snake case staging: sm750fb: Rename dviInit to dvi_init and update param names staging: sm750fb: Update param names of PFN_DVICTRL_INIT function pointer staging: sm750fb: Remove type names in variables and type definitions staging: sm750fb: Remove remaining camel case names in ddk750_dvi.h staging: sm750fb: Update displayControlAdjust_SM750LE to snake case staging: sm750fb: Update programModeRegisters to snake case staging: sm750fb: Update enum values in dpms to snake case staging: sm750fb: Rename sm750_set_power_mode function parameter staging: sm750fb: Rename ddk750_setModeTiming to ddk750_set_mode_timing staging: sm750fb: Rename i2cWriteReg and i2cReadReg to snake case staging: sm750fb: Rename vendorID local variable to snake case staging: sm750fb: Rename deviceID local variable to snake case staging: sm750fb: Rename sii164SelectHotPlugDetectionMode to snake case staging: sm750fb: Rename gDviCtrlChipName to snake case staging: sm750fb: Update function parameter names in ddk750_sii164.c staging: sm750fb: Rename local variables to snake case staging: sm750fb: Rename function params of sii164_init_chip staging: sm750fb: Rename function parameter of sii164_enable_hot_plug_detection staging: sm750fb: Update function parameter names to snake case staging: sm750fb: Rename function write_dpPort to snake case staging: sm750fb: Update local variable in sm750_hw_copyarea to snake case staging: sm750fb: Update local variables in sm750_hw_imageblit to snake case staging: sm750fb: Update local variable in sm750_hw_fillrect to snake case staging: sm750fb: Rename deGetTransparency to snake case staging: sm750fb: Update function parameter of sm750_hw_imageblit to snake case staging: sm750fb: Rename function params to snake case in sm750_accel.h staging: sm750fb: Update members of lynx_cursor to snake case staging: sm750fb: Rename function sm750_hw_cursor_setSize to snake case staging: sm750fb: Rename function sm750_hw_cursor_setPos to snake case staging: sm750fb: Rename function sm750_hw_cursor_setColor to snake case staging: sm750fb: Rename function sm750_hw_cursor_setData to snake case staging: sm750fb: Rename function hw_sm750_crtc_setMode to snake case staging: sm750fb: Update members of init_status struct to snake case staging: sm750fb: Update members of sm750_dev struct to snake case staging: sm750fb: Update members of lynxfb_crtc struct to snake case staging: sm750fb: Rename function hw_sm750_output_setMode to snake case staging: sm750fb: Rename function hw_sm750_setColReg to snake case staging: sm750fb: Rename functions *_setBLANK to snake case staging: sm750fb: Rename function sm750_hw_cursor_setData2 to snake case staging: sm750fb: Rename function hw_sm750_initAccel to snake case staging: sm750fb: Rename functions *_deWait to snake case staging: sm750fb: Update members of lynx_accel struct to snake case staging: sm750fb: Rename function hw_sm750_crtc_checkMode to snake case staging: sm750fb: Rename sii164_set_power function parameter staging: sm750fb: Rename local variable Bpp to bpp in sm750.c staging: sm750fb: Rename proc_setBLANK member of lynxfb_output struct staging: sm750fb: Rename fixId to fix_id staging: sm750fb: Update members of sm750_pnltype struct to snake case drivers/staging/sm750fb/ddk750_dvi.c| 32 ++--- drivers/staging/sm750fb/ddk750_dvi.h| 80 ++--- drivers/staging/sm750fb/ddk750_mode.c | 88 +++--- drivers/staging/sm750fb/ddk750_mode.h | 2 +- drivers/staging/sm750fb/ddk750_power.h | 10 +- drivers/staging/sm750fb/ddk750_sii164.c | 152 drivers/staging/sm750fb/ddk750_sii164.h | 40 +++ drivers/staging/sm750fb/sm750.c | 130 ++-- drivers/staging/sm750fb/sm750.h | 56 - drivers/staging/sm750fb/sm750_accel.c | 148 +++ drivers/staging/sm750fb/sm750_accel.h | 42 +++ drivers/staging/sm750fb/sm750_cursor.c | 14 +-- drivers/staging/sm750fb/sm750_cursor.h | 10 +- drivers/staging/sm750fb/sm750_hw.c | 56 - 14 files changed, 430 insertions(+), 430 deletions(-) -- 2.30.2
Re: [PATCH] staging: sm750fb: Convert camel case to snake case
On Tue, Apr 06, 2021 at 11:36:41AM +0200, Greg KH wrote: > On Tue, Apr 06, 2021 at 02:18:41AM -0700, Pavle Rohalj wrote: > > - struct dvi_ctrl_device *pCurrentDviCtrl; > > + struct dvi_ctrl_device *p_current_dvi_ctrl; > > Does this change make sense? Why keep the "p_" here? We do not need or > use, this type of variable naming in the kernel. > > Also, please break this up into a patch series where you do one > structure change at a time. > > thanks, > > greg k-h Thank you for the input. Makes sense why we would not want to include type information in variable names. I will send a patchset with changes broken up into smaller chunks soon. -Pavle
[PATCH] staging: sm750fb: Convert camel case to snake case
Fix "Avoid CamelCase" checkpatch.pl checks for 106 camel case
instances:
Signed-off-by: Pavle Rohalj
---
drivers/staging/sm750fb/ddk750_dvi.c| 32 ++---
drivers/staging/sm750fb/ddk750_dvi.h| 64 +-
drivers/staging/sm750fb/ddk750_mode.c | 88 +++---
drivers/staging/sm750fb/ddk750_mode.h | 2 +-
drivers/staging/sm750fb/ddk750_power.h | 10 +-
drivers/staging/sm750fb/ddk750_sii164.c | 152
drivers/staging/sm750fb/ddk750_sii164.h | 40 +++
drivers/staging/sm750fb/sm750.c | 128 ++--
drivers/staging/sm750fb/sm750.h | 54 -
drivers/staging/sm750fb/sm750_accel.c | 148 +++
drivers/staging/sm750fb/sm750_accel.h | 42 +++
drivers/staging/sm750fb/sm750_cursor.c | 14 +--
drivers/staging/sm750fb/sm750_cursor.h | 10 +-
drivers/staging/sm750fb/sm750_hw.c | 54 -
14 files changed, 419 insertions(+), 419 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
b/drivers/staging/sm750fb/ddk750_dvi.c
index cd564ea40779..a11b5fae45fa 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -11,26 +11,26 @@
* function API. Please set the function pointer to NULL whenever the function
* is not supported.
*/
-static struct dvi_ctrl_device g_dcftSupportedDviController[] = {
+static struct dvi_ctrl_device g_dcft_supported_dvi_controller[] = {
#ifdef DVI_CTRL_SII164
{
- .pfnInit = sii164InitChip,
- .pfnGetVendorId = sii164GetVendorID,
- .pfnGetDeviceId = sii164GetDeviceID,
+ .pfn_init = sii164_init_chip,
+ .pfn_get_vendor_id = sii164_get_vendor_id,
+ .pfn_get_device_id = sii164_get_device_id,
#ifdef SII164_FULL_FUNCTIONS
- .pfnResetChip = sii164ResetChip,
- .pfnGetChipString = sii164GetChipString,
- .pfnSetPower = sii164SetPower,
- .pfnEnableHotPlugDetection = sii164EnableHotPlugDetection,
- .pfnIsConnected = sii164IsConnected,
- .pfnCheckInterrupt = sii164CheckInterrupt,
- .pfnClearInterrupt = sii164ClearInterrupt,
+ .pfn_reset_chip = sii164_reset_chip,
+ .pfn_get_chip_string = sii164_get_chip_string,
+ .pfn_set_power = sii164_set_power,
+ .pfn_enable_hot_plug_detection =
sii164_enable_hot_plug_detection,
+ .pfn_is_connected = sii164_is_connected,
+ .pfn_check_interrupt = sii164_check_interrupt,
+ .pfn_clear_interrupt = sii164_clear_interrupt,
#endif
},
#endif
};
-int dviInit(unsigned char edge_select,
+int dvi_init(unsigned char edge_select,
unsigned char bus_select,
unsigned char dual_edge_clk_select,
unsigned char hsync_enable,
@@ -41,11 +41,11 @@ int dviInit(unsigned char edge_select,
unsigned char pll_filter_enable,
unsigned char pll_filter_value)
{
- struct dvi_ctrl_device *pCurrentDviCtrl;
+ struct dvi_ctrl_device *p_current_dvi_ctrl;
- pCurrentDviCtrl = g_dcftSupportedDviController;
- if (pCurrentDviCtrl->pfnInit) {
- return pCurrentDviCtrl->pfnInit(edge_select,
+ p_current_dvi_ctrl = g_dcft_supported_dvi_controller;
+ if (p_current_dvi_ctrl->pfn_init) {
+ return p_current_dvi_ctrl->pfn_init(edge_select,
bus_select,
dual_edge_clk_select,
hsync_enable,
diff --git a/drivers/staging/sm750fb/ddk750_dvi.h
b/drivers/staging/sm750fb/ddk750_dvi.h
index 1c7a565b617a..57ae2d2672a7 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.h
+++ b/drivers/staging/sm750fb/ddk750_dvi.h
@@ -4,54 +4,54 @@
/* dvi chip stuffs structros */
-typedef long (*PFN_DVICTRL_INIT)(unsigned char edgeSelect,
-unsigned char busSelect,
-unsigned char dualEdgeClkSelect,
-unsigned char hsyncEnable,
-unsigned char vsyncEnable,
-unsigned char deskewEnable,
-unsigned char deskewSetting,
-unsigned char continuousSyncEnable,
-unsigned char pllFilterEnable,
-unsigned char pllFilterValue);
+typedef long (*PFN_DVICTRL_INIT)(unsigned char edge_select,
+unsigned char bus_select,
+unsigned char dual_edge_clk_select,
+unsigned char hsync_enable,
+unsigned char vsync_enable,
+unsigned char deskew_enable,
+
