From 7beceba15c02dd679c76c8dc7e911ba5523fe2ef Mon Sep 17 00:00:00 2001 From: Harsha Sharma Date: Sat, 9 Sep 2017 16:04:47 +0530 Subject: staging: sm750fb: Remove extra blank lines This was reported by checkpatch.pl Signed-off-by: Harsha Sharma Acked-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/sm750_cursor.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/staging/sm750fb') diff --git a/drivers/staging/sm750fb/sm750_cursor.c b/drivers/staging/sm750fb/sm750_cursor.c index aa47a16ac75c..6b27b061d4cf 100644 --- a/drivers/staging/sm750fb/sm750_cursor.c +++ b/drivers/staging/sm750fb/sm750_cursor.c @@ -18,8 +18,6 @@ #include "sm750.h" #include "sm750_cursor.h" - - #define poke32(addr, data) \ writel((data), cursor->mmio + (addr)) @@ -45,7 +43,6 @@ writel((data), cursor->mmio + (addr)) #define HWC_COLOR_3 0xC #define HWC_COLOR_3_RGB565_MASK 0xffff - /* hw_cursor_xxx works for voyager,718 and 750 */ void sm750_hw_cursor_enable(struct lynx_cursor *cursor) { @@ -134,7 +131,6 @@ void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16 rop, } } - void sm750_hw_cursor_setData2(struct lynx_cursor *cursor, u16 rop, const u8 *pcol, const u8 *pmsk) { -- cgit From 3ec58059d16ba2a9e47c697546e5cb92dbf4f10a Mon Sep 17 00:00:00 2001 From: Keerthi Reddy Date: Mon, 2 Oct 2017 15:01:14 +0530 Subject: Staging: sm750fb: remove typedef for enum in ddk750_power.{c,h} Using typedef will hide that 'DPMS_t' is enum. Removing this will make sure that we are actually working with enum. Also it is not a good coding style to use typedef In this commit remove typedef and lowercaser the name 'DPMS_t'. And also drop '_t' which traditionally means typedef. Signed-off-by: Keerthi Reddy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/ddk750_power.c | 2 +- drivers/staging/sm750fb/ddk750_power.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'drivers/staging/sm750fb') diff --git a/drivers/staging/sm750fb/ddk750_power.c b/drivers/staging/sm750fb/ddk750_power.c index 222ae1a06feb..6f82ab05fdb6 100644 --- a/drivers/staging/sm750fb/ddk750_power.c +++ b/drivers/staging/sm750fb/ddk750_power.c @@ -2,7 +2,7 @@ #include "ddk750_reg.h" #include "ddk750_power.h" -void ddk750_set_dpms(DPMS_t state) +void ddk750_set_dpms(enum dpms state) { unsigned int value; diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h index 44c4fc587e96..033889f63920 100644 --- a/drivers/staging/sm750fb/ddk750_power.h +++ b/drivers/staging/sm750fb/ddk750_power.h @@ -1,20 +1,19 @@ #ifndef DDK750_POWER_H__ #define DDK750_POWER_H__ -typedef enum _DPMS_t { +enum dpms { crtDPMS_ON = 0x0, crtDPMS_STANDBY = 0x1, crtDPMS_SUSPEND = 0x2, crtDPMS_OFF = 0x3, -} -DPMS_t; +}; #define setDAC(off) { \ poke32(MISC_CTRL, \ (peek32(MISC_CTRL) & ~MISC_CTRL_DAC_POWER_OFF) | (off)); \ } -void ddk750_set_dpms(DPMS_t state); +void ddk750_set_dpms(enum dpms state); void sm750_set_power_mode(unsigned int powerMode); void sm750_set_current_gate(unsigned int gate); -- cgit From 60d379e12916ebed0370dd16ee417a56085db1d4 Mon Sep 17 00:00:00 2001 From: Keerthi Reddy Date: Mon, 2 Oct 2017 15:02:03 +0530 Subject: staging: sm750fb: remove typedef for enum in ddk750_sii164.{c,h} Removing this will make sure that we are actually working with enum. Also it is not a good coding style to use typedef. In this commit remove typedef and also drop '_t' which traditionally means typedef Signed-off-by: Keerthi Reddy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/ddk750_sii164.c | 3 ++- drivers/staging/sm750fb/ddk750_sii164.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers/staging/sm750fb') diff --git a/drivers/staging/sm750fb/ddk750_sii164.c b/drivers/staging/sm750fb/ddk750_sii164.c index 0431833de781..3d68e1d00cb1 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.c +++ b/drivers/staging/sm750fb/ddk750_sii164.c @@ -296,7 +296,8 @@ void sii164SetPower(unsigned char powerUp) * sii164SelectHotPlugDetectionMode * This function selects the mode of the hot plug detection. */ -static void sii164SelectHotPlugDetectionMode(sii164_hot_plug_mode_t hotPlugMode) +static +void sii164SelectHotPlugDetectionMode(enum sii164_hot_plug_mode hotPlugMode) { unsigned char detectReg; diff --git a/drivers/staging/sm750fb/ddk750_sii164.h b/drivers/staging/sm750fb/ddk750_sii164.h index 6968cf532f16..e06ba729b4e2 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.h +++ b/drivers/staging/sm750fb/ddk750_sii164.h @@ -4,12 +4,12 @@ #define USE_DVICHIP /* Hot Plug detection mode structure */ -typedef enum _sii164_hot_plug_mode_t { +enum sii164_hot_plug_mode { 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; +}; /* Silicon Image SiI164 chip prototype */ -- cgit From f290d491b59c55bec43003648a4df1a64e6292f6 Mon Sep 17 00:00:00 2001 From: Mihaela Muraru Date: Mon, 2 Oct 2017 04:15:11 -0700 Subject: staging: sm750fb: Remove typedef struct _dvi_ctrl_device_t This patch removes typedef from struct and renames it from "_dvi_ctrl_device_t" to "dvi_ctrl_device" as per kernel coding standards. Issue found by checpatch.pl Signed-off-by: Mihaela Muraru Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/ddk750_dvi.c | 4 ++-- drivers/staging/sm750fb/ddk750_dvi.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/staging/sm750fb') diff --git a/drivers/staging/sm750fb/ddk750_dvi.c b/drivers/staging/sm750fb/ddk750_dvi.c index 87a199d6cdaf..6ecdcf0afd14 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.c +++ b/drivers/staging/sm750fb/ddk750_dvi.c @@ -10,7 +10,7 @@ * function API. Please set the function pointer to NULL whenever the function * is not supported. */ -static dvi_ctrl_device_t g_dcftSupportedDviController[] = { +static struct dvi_ctrl_device g_dcftSupportedDviController[] = { #ifdef DVI_CTRL_SII164 { .pfnInit = sii164InitChip, @@ -40,7 +40,7 @@ int dviInit(unsigned char edgeSelect, unsigned char pllFilterEnable, unsigned char pllFilterValue) { - dvi_ctrl_device_t *pCurrentDviCtrl; + struct dvi_ctrl_device *pCurrentDviCtrl; pCurrentDviCtrl = g_dcftSupportedDviController; if (pCurrentDviCtrl->pfnInit) { diff --git a/drivers/staging/sm750fb/ddk750_dvi.h b/drivers/staging/sm750fb/ddk750_dvi.h index 4a8394561f76..692888ceee40 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.h +++ b/drivers/staging/sm750fb/ddk750_dvi.h @@ -25,7 +25,7 @@ typedef unsigned char (*PFN_DVICTRL_CHECKINTERRUPT)(void); typedef void (*PFN_DVICTRL_CLEARINTERRUPT)(void); /* Structure to hold all the function pointer to the DVI Controller. */ -typedef struct _dvi_ctrl_device_t { +struct dvi_ctrl_device { PFN_DVICTRL_INIT pfnInit; PFN_DVICTRL_RESETCHIP pfnResetChip; PFN_DVICTRL_GETCHIPSTRING pfnGetChipString; @@ -36,7 +36,7 @@ typedef struct _dvi_ctrl_device_t { PFN_DVICTRL_ISCONNECTED pfnIsConnected; PFN_DVICTRL_CHECKINTERRUPT pfnCheckInterrupt; PFN_DVICTRL_CLEARINTERRUPT pfnClearInterrupt; -} dvi_ctrl_device_t; +}; #define DVI_CTRL_SII164 -- cgit From 16808dcf605e6302319a8c3266789b76d4c0983b Mon Sep 17 00:00:00 2001 From: Huacai Chen Date: Mon, 6 Nov 2017 08:43:03 +0800 Subject: staging: sm750fb: Fix parameter mistake in poke32 In commit c075b6f2d357ea9 ("staging: sm750fb: Replace POKE32 and PEEK32 by inline functions"), POKE32 has been replaced by the inline function poke32. But it exchange the "addr" and "data" parameters by mistake, so fix it. Fixes: c075b6f2d357ea9 ("staging: sm750fb: Replace POKE32 and PEEK32 by inline functions"), Signed-off-by: Huacai Chen Signed-off-by: Liangliang Huang Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/ddk750_chip.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging/sm750fb') diff --git a/drivers/staging/sm750fb/ddk750_chip.h b/drivers/staging/sm750fb/ddk750_chip.h index 2c7a9b9a7c8a..d9d4c485e54c 100644 --- a/drivers/staging/sm750fb/ddk750_chip.h +++ b/drivers/staging/sm750fb/ddk750_chip.h @@ -17,7 +17,7 @@ static inline u32 peek32(u32 addr) return readl(addr + mmio750); } -static inline void poke32(u32 data, u32 addr) +static inline void poke32(u32 addr, u32 data) { writel(data, addr + mmio750); } -- cgit