Re: [PATCH] sm750fb: coding style fixes lines over 80 chars
#if 0, but it's also obviously incorrect It supposed to be some tag #ifdef CONFIG_** . Could anybody in the loop can reply? i was just checking on style checks. Will skip this file , will take up later On Thu, Jul 16, 2015 at 9:27 AM, Joe Perches wrote: > On Thu, 2015-07-16 at 00:16 +0530, Vinay Simha BN wrote: >> scripts/checkpatch.pl kernel coding style fixes of WARNING > > Please don't be a checkpatch robot. > > Use tools to prompt your brain, but don't ever turn > your brain off. > >> diff --git a/drivers/staging/sm750fb/ddk750_help.h >> b/drivers/staging/sm750fb/ddk750_help.h > > >> +/* if 718 big endian turned on,be aware that don't use this driver for >> general >> + use,only for ppc big-endian */ >> +#warning "big endian on target cpu and enable nature big endian support of >> 718 >> + capability !" > > Yes, this if #if 0, but it's also obviously incorrect > > I didn't look at the rest. > > -- Regards, Vinay Simha.B.N. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Const-qualify, WARNING, out-of memory usage fixes
Signed-off-by: Vinay Simha BN --- drivers/staging/sm750fb/sm750.c | 53 + 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 6b642d7..f378843 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -24,7 +24,7 @@ #include "modedb.h" -int smi_indent = 0; +int smi_indent; /* @@ -45,11 +45,11 @@ typedef int (*PROC_SPEC_INITHW)(struct lynx_share*, struct pci_dev*); static int g_hwcursor = 1; static int g_noaccel; static int g_nomtrr; -static const char *g_fbmode[] = {NULL, NULL}; -static const char *g_def_fbmode = "800x600-16@60"; -static char *g_settings = NULL; +static const char *const g_fbmode[] = {NULL, NULL}; +static const char *const g_def_fbmode = "800x600-16@60"; +static char *g_settings; static int g_dualview; -static char *g_option = NULL; +static char *g_option; static const struct fb_videomode lynx750_ext[] = { @@ -150,12 +150,16 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor) u16 fg, bg; fg = ((info->cmap.red[fbcursor->image.fg_color] & 0xf800))| - ((info->cmap.green[fbcursor->image.fg_color] & 0xfc00) >> 5)| - ((info->cmap.blue[fbcursor->image.fg_color] & 0xf800) >> 11); + ((info->cmap.green[fbcursor->image.fg_color] +& 0xfc00) >> 5)| + ((info->cmap.blue[fbcursor->image.fg_color] + & 0xf800) >> 11); bg = ((info->cmap.red[fbcursor->image.bg_color] & 0xf800))| - ((info->cmap.green[fbcursor->image.bg_color] & 0xfc00) >> 5)| - ((info->cmap.blue[fbcursor->image.bg_color] & 0xf800) >> 11); + ((info->cmap.green[fbcursor->image.bg_color] & + 0xfc00) >> 5)| + ((info->cmap.blue[fbcursor->image.bg_color] & + 0xf800) >> 11); cursor->setColor(cursor, fg, bg); } @@ -194,7 +198,8 @@ static void lynxfb_ops_fillrect(struct fb_info *info, pitch = info->fix.line_length; Bpp = info->var.bits_per_pixel >> 3; - color = (Bpp == 1)?region->color:((u32 *)info->pseudo_palette)[region->color]; + color = (Bpp == 1) ? + region->color : ((u32 *)info->pseudo_palette)[region->color]; rop = (region->rop != ROP_COPY) ? HW_ROP2_XOR:HW_ROP2_COPY; /* @@ -445,7 +450,8 @@ static int lynxfb_suspend(struct pci_dev *pdev, pm_message_t mesg) pci_disable_device(pdev); ret = pci_set_power_state(pdev, pci_choose_state(pdev, mesg)); if (ret) { - pr_err("error:%d occurred in pci_set_power_state\n", ret); + pr_err("error:%d occurred in + pci_set_power_state\n", ret); return ret; } } @@ -699,7 +705,8 @@ static int sm750fb_set_drv(struct lynxfb_par *par) output = &par->output; crtc = &par->crtc; - crtc->vidmem_size = (share->dual)?share->vidmem_size>>1:share->vidmem_size; + crtc->vidmem_size = (share->dual) ? + share->vidmem_size>>1 : share->vidmem_size; /* setup crtc and output member */ spec_share->hwCursor = g_hwcursor; @@ -716,10 +723,12 @@ static int sm750fb_set_drv(struct lynxfb_par *par) output->proc_setMode = hw_sm750_output_setMode; output->proc_checkMode = hw_sm750_output_checkMode; - output->proc_setBLANK = (share->revid == SM750LE_REVISION_ID)?hw_sm750le_setBLANK:hw_sm750_setBLANK; + output->proc_setBLANK = (share->revid == SM750LE_REVISION_ID) ? + hw_sm750le_setBLANK : hw_sm750_setBLANK; output->clear = hw_sm750_output_clear; /* chip specific phase */ - share->accel.de_wait = (share->revid == SM750LE_REVISION_ID)?hw_sm750le_deWait : hw_sm750_deWait; + share->accel.de_wait = (share->revid == SM750LE_REVISION_ID) ? + hw_sm750le_deWait : hw_sm750_deWait; switch (spec_share->state.dataflow) { case sm750_simul_pri: output->paths = sm750_pnc; @@ -743,7 +752,8 @@ static int sm750fb_set_drv(struct lynxfb_par *par) } else { output->paths = sm750_crt; crtc->channel = sm750_secondary; - /* not consider of padding stuffs for oScreen,need fix */
[PATCH] staging: sm750fb: coding style fixes
kernel coding style fixes for below messages from scripts/checkpatch.pl WARNING: line over 80 character WARNING: Possible unnecessary 'out of memory' message WARNING: unnecessary whitespace before a quoted newline WARNING: Avoid line continuations in quoted strings ERROR: "foo * bar" should be "foo *bar" ERROR: do not initialise globals to 0 or NULL Signed-off-by: Vinay Simha BN --- drivers/staging/sm750fb/sm750.c | 49 - 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 6b642d7..12214f7 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -24,7 +24,7 @@ #include "modedb.h" -int smi_indent = 0; +int smi_indent; /* @@ -47,9 +47,9 @@ static int g_noaccel; static int g_nomtrr; static const char *g_fbmode[] = {NULL, NULL}; static const char *g_def_fbmode = "800x600-16@60"; -static char *g_settings = NULL; +static char *g_settings; static int g_dualview; -static char *g_option = NULL; +static char *g_option; static const struct fb_videomode lynx750_ext[] = { @@ -150,12 +150,16 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor) u16 fg, bg; fg = ((info->cmap.red[fbcursor->image.fg_color] & 0xf800))| - ((info->cmap.green[fbcursor->image.fg_color] & 0xfc00) >> 5)| - ((info->cmap.blue[fbcursor->image.fg_color] & 0xf800) >> 11); + ((info->cmap.green[fbcursor->image.fg_color] +& 0xfc00) >> 5)| + ((info->cmap.blue[fbcursor->image.fg_color] + & 0xf800) >> 11); bg = ((info->cmap.red[fbcursor->image.bg_color] & 0xf800))| - ((info->cmap.green[fbcursor->image.bg_color] & 0xfc00) >> 5)| - ((info->cmap.blue[fbcursor->image.bg_color] & 0xf800) >> 11); + ((info->cmap.green[fbcursor->image.bg_color] & + 0xfc00) >> 5)| + ((info->cmap.blue[fbcursor->image.bg_color] & + 0xf800) >> 11); cursor->setColor(cursor, fg, bg); } @@ -194,7 +198,8 @@ static void lynxfb_ops_fillrect(struct fb_info *info, pitch = info->fix.line_length; Bpp = info->var.bits_per_pixel >> 3; - color = (Bpp == 1)?region->color:((u32 *)info->pseudo_palette)[region->color]; + color = (Bpp == 1) ? + region->color : ((u32 *)info->pseudo_palette)[region->color]; rop = (region->rop != ROP_COPY) ? HW_ROP2_XOR:HW_ROP2_COPY; /* @@ -445,7 +450,8 @@ static int lynxfb_suspend(struct pci_dev *pdev, pm_message_t mesg) pci_disable_device(pdev); ret = pci_set_power_state(pdev, pci_choose_state(pdev, mesg)); if (ret) { - pr_err("error:%d occurred in pci_set_power_state\n", ret); + pr_err("error:%d occurred in + pci_set_power_state\n", ret); return ret; } } @@ -699,7 +705,8 @@ static int sm750fb_set_drv(struct lynxfb_par *par) output = &par->output; crtc = &par->crtc; - crtc->vidmem_size = (share->dual)?share->vidmem_size>>1:share->vidmem_size; + crtc->vidmem_size = (share->dual) ? + share->vidmem_size>>1 : share->vidmem_size; /* setup crtc and output member */ spec_share->hwCursor = g_hwcursor; @@ -716,10 +723,12 @@ static int sm750fb_set_drv(struct lynxfb_par *par) output->proc_setMode = hw_sm750_output_setMode; output->proc_checkMode = hw_sm750_output_checkMode; - output->proc_setBLANK = (share->revid == SM750LE_REVISION_ID)?hw_sm750le_setBLANK:hw_sm750_setBLANK; + output->proc_setBLANK = (share->revid == SM750LE_REVISION_ID) ? + hw_sm750le_setBLANK : hw_sm750_setBLANK; output->clear = hw_sm750_output_clear; /* chip specific phase */ - share->accel.de_wait = (share->revid == SM750LE_REVISION_ID)?hw_sm750le_deWait : hw_sm750_deWait; + share->accel.de_wait = (share->revid == SM750LE_REVISION_ID) ? + hw_sm750le_deWait : hw_sm750_deWait; switch (spec_share->state.dataflow) { case sm750_simul_pri: output->paths = sm750_pnc; @@ -743,7 +752,8 @@ static int sm750fb_set_drv(struct lynxfb_par *par) } else { output->paths = sm750_crt;
[PATCH] staging: sm750fb: coding style global ERROR fixes
kernel coding style fixes for below messages from scripts/checkpatch.pl ERROR: do not initialise globals to 0 or NULL Signed-off-by: Vinay Simha BN --- drivers/staging/sm750fb/ddk750_help.c | 6 +++--- drivers/staging/sm750fb/sm750.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/sm750fb/ddk750_help.c b/drivers/staging/sm750fb/ddk750_help.c index 1adcafc..f027df5 100644 --- a/drivers/staging/sm750fb/ddk750_help.c +++ b/drivers/staging/sm750fb/ddk750_help.c @@ -1,8 +1,8 @@ #include "ddk750_help.h" -void __iomem *mmio750 = NULL; -char revId750 = 0; -unsigned short devId750 = 0; +void __iomem *mmio750; +char revId750; +unsigned short devId750; /* after driver mapped io registers, use this function first */ void ddk750_set_mmio(void __iomem *addr, unsigned short devId, char revId) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 8e201f1..4d165ca 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -24,7 +24,7 @@ #include "modedb.h" -int smi_indent = 0; +int smi_indent; /* @@ -47,9 +47,9 @@ static int g_noaccel; static int g_nomtrr; static const char *g_fbmode[] = {NULL, NULL}; static const char *g_def_fbmode = "800x600-16@60"; -static char *g_settings = NULL; +static char *g_settings; static int g_dualview; -static char *g_option = NULL; +static char *g_option; static const struct fb_videomode lynx750_ext[] = { -- 2.1.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] sm750fb: coding style fixes lines over 80 chars
scripts/checkpatch.pl kernel coding style fixes of WARNING WARNING: line over 80 characters Signed-off-by: Vinay Simha BN --- drivers/staging/sm750fb/ddk750_display.h | 10 +- drivers/staging/sm750fb/ddk750_help.h| 6 -- drivers/staging/sm750fb/ddk750_hwi2c.h | 6 -- drivers/staging/sm750fb/ddk750_power.h | 6 +++--- drivers/staging/sm750fb/ddk750_sii164.h | 12 +++- drivers/staging/sm750fb/sm750.h | 13 - drivers/staging/sm750fb/sm750_accel.h| 19 --- drivers/staging/sm750fb/sm750_help.h | 24 drivers/staging/sm750fb/sm750_hw.h | 19 --- 9 files changed, 71 insertions(+), 44 deletions(-) diff --git a/drivers/staging/sm750fb/ddk750_display.h b/drivers/staging/sm750fb/ddk750_display.h index ae0f84c..eb36a08 100644 --- a/drivers/staging/sm750fb/ddk750_display.h +++ b/drivers/staging/sm750fb/ddk750_display.h @@ -111,19 +111,19 @@ typedef enum _disp_output_t /* LCD1 show secondary and DSUB show primary */ LCD1_DSUB_DUAL_SWAP = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON| - CRT_2_PRI|PRI_TP_ON|DAC_ON, + CRT_2_PRI|PRI_TP_ON|DAC_ON, LCD1_LCD2_PRI = PNL_2_PRI|PRI_TP_ON|PNL_SEQ_ON| - CRT_2_PRI|SEC_TP_OFF|DPMS_OFF|DUAL_TFT_ON, + CRT_2_PRI|SEC_TP_OFF|DPMS_OFF|DUAL_TFT_ON, LCD1_LCD2_SEC = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON| - CRT_2_SEC|PRI_TP_OFF|DPMS_OFF|DUAL_TFT_ON, + CRT_2_SEC|PRI_TP_OFF|DPMS_OFF|DUAL_TFT_ON, LCD1_LCD2_DSUB_PRI = PNL_2_PRI|PRI_TP_ON|PNL_SEQ_ON|DAC_ON| - CRT_2_PRI|SEC_TP_OFF|DPMS_ON|DUAL_TFT_ON, + CRT_2_PRI|SEC_TP_OFF|DPMS_ON|DUAL_TFT_ON, LCD1_LCD2_DSUB_SEC = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON|DAC_ON| - CRT_2_SEC|PRI_TP_OFF|DPMS_ON|DUAL_TFT_ON, + CRT_2_SEC|PRI_TP_OFF|DPMS_ON|DUAL_TFT_ON, } diff --git a/drivers/staging/sm750fb/ddk750_help.h b/drivers/staging/sm750fb/ddk750_help.h index 4285b05..1cb6ea5 100644 --- a/drivers/staging/sm750fb/ddk750_help.h +++ b/drivers/staging/sm750fb/ddk750_help.h @@ -10,8 +10,10 @@ #if 0 -/* if 718 big endian turned on,be aware that don't use this driver for general use,only for ppc big-endian */ -#warning "big endian on target cpu and enable nature big endian support of 718 capability !" +/* if 718 big endian turned on,be aware that don't use this driver for general +use,only for ppc big-endian */ +#warning "big endian on target cpu and enable nature big endian support of 718 + capability !" #define PEEK32(addr) __raw_readl(mmio750 + addr) #define POKE32(addr, data) __raw_writel(data, mmio750 + addr) #else /* software control endianness */ diff --git a/drivers/staging/sm750fb/ddk750_hwi2c.h b/drivers/staging/sm750fb/ddk750_hwi2c.h index 0b830ba6..3d4e48b 100644 --- a/drivers/staging/sm750fb/ddk750_hwi2c.h +++ b/drivers/staging/sm750fb/ddk750_hwi2c.h @@ -5,6 +5,8 @@ int hwI2CInit(unsigned char busSpeedMode); void hwI2CClose(void); -unsigned char hwI2CReadReg(unsigned char deviceAddress, unsigned char registerIndex); -int hwI2CWriteReg(unsigned char deviceAddress, unsigned char registerIndex, unsigned char data); +unsigned char hwI2CReadReg(unsigned char deviceAddress, + unsigned char registerIndex); +int hwI2CWriteReg(unsigned char deviceAddress, unsigned char registerIndex, + unsigned char data); #endif diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h index 4e00955..c5fe37e 100644 --- a/drivers/staging/sm750fb/ddk750_power.h +++ b/drivers/staging/sm750fb/ddk750_power.h @@ -13,9 +13,9 @@ DPMS_t; #define setDAC(off) \ { \ POKE32(MISC_CTRL, FIELD_VALUE(PEEK32(MISC_CTRL), \ - MISC_CTRL, \ - DAC_POWER, \ - off)); \ + MISC_CTRL, \ + DAC_POWER, \ + off)); \ } void ddk750_setDPMS(DPMS_t); diff --git a/drivers/staging/sm750fb/ddk750_sii164.h b/drivers/staging/sm750fb/ddk750_sii164.h index 2b4c7d3..c57c799 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.h +++ b/drivers/staging/sm750fb/ddk750_sii164.h @@ -6,10 +6,11 @@ /* Hot Plug detection mode structure */ typedef enum _sii164_hot_plug_mode_t { -SII164_HOTPLUG_DISABLE = 0, /* Disable Hot Plug output bit (always high). */ -SII164_HOTPLUG_USE_MDI,
[PATCH] sm750fb: coding style fixes lines over 80 chars
scripts/checkpatch.pl kernel coding style fixes of WARNING WARNING: line over 80 characters Signed-off-by: Vinay Simha BN --- drivers/staging/sm750fb/ddk750_display.h | 10 +- drivers/staging/sm750fb/ddk750_hwi2c.h | 6 -- drivers/staging/sm750fb/ddk750_power.h | 6 +++--- drivers/staging/sm750fb/ddk750_sii164.h | 12 +++- drivers/staging/sm750fb/sm750.h | 13 - drivers/staging/sm750fb/sm750_accel.h| 19 --- drivers/staging/sm750fb/sm750_help.h | 21 ++--- drivers/staging/sm750fb/sm750_hw.h | 21 + 8 files changed, 66 insertions(+), 42 deletions(-) diff --git a/drivers/staging/sm750fb/ddk750_display.h b/drivers/staging/sm750fb/ddk750_display.h index abccf84..9afa366 100644 --- a/drivers/staging/sm750fb/ddk750_display.h +++ b/drivers/staging/sm750fb/ddk750_display.h @@ -110,19 +110,19 @@ typedef enum _disp_output_t { /* LCD1 show secondary and DSUB show primary */ LCD1_DSUB_DUAL_SWAP = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON| - CRT_2_PRI|PRI_TP_ON|DAC_ON, + CRT_2_PRI|PRI_TP_ON|DAC_ON, LCD1_LCD2_PRI = PNL_2_PRI|PRI_TP_ON|PNL_SEQ_ON| - CRT_2_PRI|SEC_TP_OFF|DPMS_OFF|DUAL_TFT_ON, + CRT_2_PRI|SEC_TP_OFF|DPMS_OFF|DUAL_TFT_ON, LCD1_LCD2_SEC = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON| - CRT_2_SEC|PRI_TP_OFF|DPMS_OFF|DUAL_TFT_ON, + CRT_2_SEC|PRI_TP_OFF|DPMS_OFF|DUAL_TFT_ON, LCD1_LCD2_DSUB_PRI = PNL_2_PRI|PRI_TP_ON|PNL_SEQ_ON|DAC_ON| - CRT_2_PRI|SEC_TP_OFF|DPMS_ON|DUAL_TFT_ON, + CRT_2_PRI|SEC_TP_OFF|DPMS_ON|DUAL_TFT_ON, LCD1_LCD2_DSUB_SEC = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON|DAC_ON| - CRT_2_SEC|PRI_TP_OFF|DPMS_ON|DUAL_TFT_ON, + CRT_2_SEC|PRI_TP_OFF|DPMS_ON|DUAL_TFT_ON, } diff --git a/drivers/staging/sm750fb/ddk750_hwi2c.h b/drivers/staging/sm750fb/ddk750_hwi2c.h index 0b830ba6..3d4e48b 100644 --- a/drivers/staging/sm750fb/ddk750_hwi2c.h +++ b/drivers/staging/sm750fb/ddk750_hwi2c.h @@ -5,6 +5,8 @@ int hwI2CInit(unsigned char busSpeedMode); void hwI2CClose(void); -unsigned char hwI2CReadReg(unsigned char deviceAddress, unsigned char registerIndex); -int hwI2CWriteReg(unsigned char deviceAddress, unsigned char registerIndex, unsigned char data); +unsigned char hwI2CReadReg(unsigned char deviceAddress, + unsigned char registerIndex); +int hwI2CWriteReg(unsigned char deviceAddress, unsigned char registerIndex, + unsigned char data); #endif diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h index b7cf6b2..abad4fe 100644 --- a/drivers/staging/sm750fb/ddk750_power.h +++ b/drivers/staging/sm750fb/ddk750_power.h @@ -12,9 +12,9 @@ DPMS_t; #define setDAC(off) \ { \ POKE32(MISC_CTRL, FIELD_VALUE(PEEK32(MISC_CTRL), \ - MISC_CTRL, \ - DAC_POWER, \ - off)); \ + MISC_CTRL, \ + DAC_POWER, \ + off)); \ } void ddk750_setDPMS(DPMS_t); diff --git a/drivers/staging/sm750fb/ddk750_sii164.h b/drivers/staging/sm750fb/ddk750_sii164.h index f2610c9..a5246bd 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.h +++ b/drivers/staging/sm750fb/ddk750_sii164.h @@ -5,10 +5,11 @@ /* Hot Plug detection mode structure */ typedef enum _sii164_hot_plug_mode_t { - SII164_HOTPLUG_DISABLE = 0, /* Disable Hot Plug output bit (always high). */ - SII164_HOTPLUG_USE_MDI, /* Use Monitor Detect Interrupt bit. */ - SII164_HOTPLUG_USE_RSEN,/* Use Receiver Sense detect bit. */ - SII164_HOTPLUG_USE_HTPLG/* Use Hot Plug detect bit. */ + SII164_HOTPLUG_DISABLE = 0, /* Disable Hot Plug output bit + (always high) */ + SII164_HOTPLUG_USE_MDI, /* Use Monitor Detect Interrupt bit. */ + SII164_HOTPLUG_USE_RSEN,/* Use Receiver Sense detect bit. */ + SII164_HOTPLUG_USE_HTPLG/* Use Hot Plug detect bit. */ } sii164_hot_plug_mode_t; @@ -39,7 +40,8 @@ unsigned char sii164IsConnected(void); unsigned char sii164CheckInterrupt(void); void sii164ClearInterrupt(void); #endif -/* below register definination is used for Silicon Image SiI164 DVI controller chip */ +/* below register definination is used for Silicon Image + SiI164 DVI controller chip */ /* * Vendor ID registers
[PATCH] sm750fb: coding style fixes in _accel.h,__help.h
WARNING: line over 80 characters comment block , odd statement fixes Signed-off-by: Vinay Simha BN --- drivers/staging/sm750fb/sm750_accel.h | 30 -- drivers/staging/sm750fb/sm750_help.h | 23 +-- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h index da067a0..c56fa99 100644 --- a/drivers/staging/sm750fb/sm750_accel.h +++ b/drivers/staging/sm750fb/sm750_accel.h @@ -259,12 +259,18 @@ unsigned int height, /* width and height of rectangle in pixel value */ unsigned int rop2); int hw_imageblit(struct lynx_accel *accel, -const char *pSrcbuf, /* pointer to start of source - buffer in system memory */ -u32 srcDelta, /* Pitch value (in bytes) of the source buffer, - +ive means top down and -ive mean button up */ -u32 startBit, /* Mono data can start at any bit in a byte, -this value should be 0 to 7 */ +const char *pSrcbuf, /* + * pointer to start of source + * buffer in system memory + */ +u32 srcDelta, /* + * Pitch value (in bytes) of the source buffer, + * +ive means top down and -ive mean button up + */ +u32 startBit, /* + * Mono data can start at any bit in a byte, + * this value should be 0 to 7 + */ u32 dBase, /* Address of destination: offset in frame buffer */ u32 dPitch, /* Pitch value of destination surface in BYTE */ u32 bytePerPixel, /* Color depth of destination surface */ @@ -272,9 +278,13 @@ int hw_imageblit(struct lynx_accel *accel, u32 dy, /* Starting coordinate of destination surface */ u32 width, u32 height, /* width and height of rectange in pixel value */ -u32 fColor, /* Foreground color (corresponding to a 1 in the -monochrome data */ -u32 bColor, /* Background color (corresponding to a 0 in the -monochrome data */ +u32 fColor, /* + * Foreground color (corresponding to a 1 in the + * monochrome data + */ +u32 bColor, /* + * Background color (corresponding to a 0 in the + * monochrome data + */ u32 rop2); #endif diff --git a/drivers/staging/sm750fb/sm750_help.h b/drivers/staging/sm750fb/sm750_help.h index 43d700b..c9378e2 100644 --- a/drivers/staging/sm750fb/sm750_help.h +++ b/drivers/staging/sm750fb/sm750_help.h @@ -1,7 +1,7 @@ #ifndef LYNX_HELP_H__ #define LYNX_HELP_H__ -/* FIELD MACROS */ +/* FIELD MACROS */ #define _LSB(f) (0 ? f) #define _MSB(f) (1 ? f) #define _COUNT(f) (_MSB(f) - _LSB(f) + 1) @@ -46,27 +46,6 @@ ~ _F_MASK(reg ## _ ## field) \ ) -/* Field Macros */ -#define FIELD_START(field) (0 ? field) -#define FIELD_END(field)(1 ? field) -#define FIELD_SIZE(field) (1 + FIELD_END(field) - \ - FIELD_START(field)) -#define FIELD_MASK(field) (((1 << (FIELD_SIZE(field)-1)) \ - | ((1 << (FIELD_SIZE(field)-1)) - 1)) \ - << FIELD_START(field)) -#define FIELD_NORMALIZE(reg, field) (((reg) & FIELD_MASK(field)) >> \ - FIELD_START(field)) -#define FIELD_DENORMALIZE(field, value) (((value) << FIELD_START(field)) & \ -FIELD_MASK(field)) - -#define FIELD_INIT(reg, field, value) FIELD_DENORMALIZE(reg ## _ ## field, \ - reg ## _ ## field ## _ ## value) -#define FIELD_INIT_VAL(reg, field, value) \ - (FIELD_DENORMALIZE(reg ## _ ## field, value)) -#define FIELD_VAL_SET(x, r, f, v) x = x & ~FIELD_MASK(r ## _ ## f) \ - | FIELD_DENORMALIZE(r ## _ ## f, \ -r ## _ ## f ## _ ## v) - #define RGB(r, g, b) \ ( \ (unsigned long) (((r) << 16) | ((g) << 8) | (b)) \ -- 2.1.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/2] sm750fb: coding style fixes lines over 80 chars
scripts/checkpatch.pl kernel coding style fixes of WARNING WARNING: line over 80 characters Signed-off-by: Vinay Simha BN --- drivers/staging/sm750fb/ddk750_display.h | 10 +- drivers/staging/sm750fb/ddk750_hwi2c.h | 6 -- drivers/staging/sm750fb/ddk750_power.h | 6 +++--- drivers/staging/sm750fb/ddk750_sii164.h | 12 +++- drivers/staging/sm750fb/sm750.h | 13 - drivers/staging/sm750fb/sm750_accel.h| 19 --- drivers/staging/sm750fb/sm750_help.h | 21 ++--- drivers/staging/sm750fb/sm750_hw.h | 21 + 8 files changed, 66 insertions(+), 42 deletions(-) diff --git a/drivers/staging/sm750fb/ddk750_display.h b/drivers/staging/sm750fb/ddk750_display.h index abccf84..9afa366 100644 --- a/drivers/staging/sm750fb/ddk750_display.h +++ b/drivers/staging/sm750fb/ddk750_display.h @@ -110,19 +110,19 @@ typedef enum _disp_output_t { /* LCD1 show secondary and DSUB show primary */ LCD1_DSUB_DUAL_SWAP = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON| - CRT_2_PRI|PRI_TP_ON|DAC_ON, + CRT_2_PRI|PRI_TP_ON|DAC_ON, LCD1_LCD2_PRI = PNL_2_PRI|PRI_TP_ON|PNL_SEQ_ON| - CRT_2_PRI|SEC_TP_OFF|DPMS_OFF|DUAL_TFT_ON, + CRT_2_PRI|SEC_TP_OFF|DPMS_OFF|DUAL_TFT_ON, LCD1_LCD2_SEC = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON| - CRT_2_SEC|PRI_TP_OFF|DPMS_OFF|DUAL_TFT_ON, + CRT_2_SEC|PRI_TP_OFF|DPMS_OFF|DUAL_TFT_ON, LCD1_LCD2_DSUB_PRI = PNL_2_PRI|PRI_TP_ON|PNL_SEQ_ON|DAC_ON| - CRT_2_PRI|SEC_TP_OFF|DPMS_ON|DUAL_TFT_ON, + CRT_2_PRI|SEC_TP_OFF|DPMS_ON|DUAL_TFT_ON, LCD1_LCD2_DSUB_SEC = PNL_2_SEC|SEC_TP_ON|PNL_SEQ_ON|DAC_ON| - CRT_2_SEC|PRI_TP_OFF|DPMS_ON|DUAL_TFT_ON, + CRT_2_SEC|PRI_TP_OFF|DPMS_ON|DUAL_TFT_ON, } diff --git a/drivers/staging/sm750fb/ddk750_hwi2c.h b/drivers/staging/sm750fb/ddk750_hwi2c.h index 0b830ba6..3d4e48b 100644 --- a/drivers/staging/sm750fb/ddk750_hwi2c.h +++ b/drivers/staging/sm750fb/ddk750_hwi2c.h @@ -5,6 +5,8 @@ int hwI2CInit(unsigned char busSpeedMode); void hwI2CClose(void); -unsigned char hwI2CReadReg(unsigned char deviceAddress, unsigned char registerIndex); -int hwI2CWriteReg(unsigned char deviceAddress, unsigned char registerIndex, unsigned char data); +unsigned char hwI2CReadReg(unsigned char deviceAddress, + unsigned char registerIndex); +int hwI2CWriteReg(unsigned char deviceAddress, unsigned char registerIndex, + unsigned char data); #endif diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h index b7cf6b2..abad4fe 100644 --- a/drivers/staging/sm750fb/ddk750_power.h +++ b/drivers/staging/sm750fb/ddk750_power.h @@ -12,9 +12,9 @@ DPMS_t; #define setDAC(off) \ { \ POKE32(MISC_CTRL, FIELD_VALUE(PEEK32(MISC_CTRL), \ - MISC_CTRL, \ - DAC_POWER, \ - off)); \ + MISC_CTRL, \ + DAC_POWER, \ + off)); \ } void ddk750_setDPMS(DPMS_t); diff --git a/drivers/staging/sm750fb/ddk750_sii164.h b/drivers/staging/sm750fb/ddk750_sii164.h index f2610c9..a5246bd 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.h +++ b/drivers/staging/sm750fb/ddk750_sii164.h @@ -5,10 +5,11 @@ /* Hot Plug detection mode structure */ typedef enum _sii164_hot_plug_mode_t { - SII164_HOTPLUG_DISABLE = 0, /* Disable Hot Plug output bit (always high). */ - SII164_HOTPLUG_USE_MDI, /* Use Monitor Detect Interrupt bit. */ - SII164_HOTPLUG_USE_RSEN,/* Use Receiver Sense detect bit. */ - SII164_HOTPLUG_USE_HTPLG/* Use Hot Plug detect bit. */ + SII164_HOTPLUG_DISABLE = 0, /* Disable Hot Plug output bit + (always high) */ + SII164_HOTPLUG_USE_MDI, /* Use Monitor Detect Interrupt bit. */ + SII164_HOTPLUG_USE_RSEN,/* Use Receiver Sense detect bit. */ + SII164_HOTPLUG_USE_HTPLG/* Use Hot Plug detect bit. */ } sii164_hot_plug_mode_t; @@ -39,7 +40,8 @@ unsigned char sii164IsConnected(void); unsigned char sii164CheckInterrupt(void); void sii164ClearInterrupt(void); #endif -/* below register definination is used for Silicon Image SiI164 DVI controller chip */ +/* below register definination is used for Silicon Image + SiI164 DVI controller chip */ /* * Vendor ID registers
[PATCH 2/2] sm750fb: coding style fixes lines over 80 chars - v2
--- drivers/staging/sm750fb/sm750_accel.h | 30 -- drivers/staging/sm750fb/sm750_help.h | 23 +-- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h index da067a0..c56fa99 100644 --- a/drivers/staging/sm750fb/sm750_accel.h +++ b/drivers/staging/sm750fb/sm750_accel.h @@ -259,12 +259,18 @@ unsigned int height, /* width and height of rectangle in pixel value */ unsigned int rop2); int hw_imageblit(struct lynx_accel *accel, -const char *pSrcbuf, /* pointer to start of source - buffer in system memory */ -u32 srcDelta, /* Pitch value (in bytes) of the source buffer, - +ive means top down and -ive mean button up */ -u32 startBit, /* Mono data can start at any bit in a byte, -this value should be 0 to 7 */ +const char *pSrcbuf, /* + * pointer to start of source + * buffer in system memory + */ +u32 srcDelta, /* + * Pitch value (in bytes) of the source buffer, + * +ive means top down and -ive mean button up + */ +u32 startBit, /* + * Mono data can start at any bit in a byte, + * this value should be 0 to 7 + */ u32 dBase, /* Address of destination: offset in frame buffer */ u32 dPitch, /* Pitch value of destination surface in BYTE */ u32 bytePerPixel, /* Color depth of destination surface */ @@ -272,9 +278,13 @@ int hw_imageblit(struct lynx_accel *accel, u32 dy, /* Starting coordinate of destination surface */ u32 width, u32 height, /* width and height of rectange in pixel value */ -u32 fColor, /* Foreground color (corresponding to a 1 in the -monochrome data */ -u32 bColor, /* Background color (corresponding to a 0 in the -monochrome data */ +u32 fColor, /* + * Foreground color (corresponding to a 1 in the + * monochrome data + */ +u32 bColor, /* + * Background color (corresponding to a 0 in the + * monochrome data + */ u32 rop2); #endif diff --git a/drivers/staging/sm750fb/sm750_help.h b/drivers/staging/sm750fb/sm750_help.h index 43d700b..c9378e2 100644 --- a/drivers/staging/sm750fb/sm750_help.h +++ b/drivers/staging/sm750fb/sm750_help.h @@ -1,7 +1,7 @@ #ifndef LYNX_HELP_H__ #define LYNX_HELP_H__ -/* FIELD MACROS */ +/* FIELD MACROS */ #define _LSB(f) (0 ? f) #define _MSB(f) (1 ? f) #define _COUNT(f) (_MSB(f) - _LSB(f) + 1) @@ -46,27 +46,6 @@ ~ _F_MASK(reg ## _ ## field) \ ) -/* Field Macros */ -#define FIELD_START(field) (0 ? field) -#define FIELD_END(field)(1 ? field) -#define FIELD_SIZE(field) (1 + FIELD_END(field) - \ - FIELD_START(field)) -#define FIELD_MASK(field) (((1 << (FIELD_SIZE(field)-1)) \ - | ((1 << (FIELD_SIZE(field)-1)) - 1)) \ - << FIELD_START(field)) -#define FIELD_NORMALIZE(reg, field) (((reg) & FIELD_MASK(field)) >> \ - FIELD_START(field)) -#define FIELD_DENORMALIZE(field, value) (((value) << FIELD_START(field)) & \ -FIELD_MASK(field)) - -#define FIELD_INIT(reg, field, value) FIELD_DENORMALIZE(reg ## _ ## field, \ - reg ## _ ## field ## _ ## value) -#define FIELD_INIT_VAL(reg, field, value) \ - (FIELD_DENORMALIZE(reg ## _ ## field, value)) -#define FIELD_VAL_SET(x, r, f, v) x = x & ~FIELD_MASK(r ## _ ## f) \ - | FIELD_DENORMALIZE(r ## _ ## f, \ -r ## _ ## f ## _ ## v) - #define RGB(r, g, b) \ ( \ (unsigned long) (((r) << 16) | ((g) << 8) | (b)) \ -- 2.1.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel