Skip to contentSkip to conversation

staging: sm750fb: Merge ddk750_help.* into ddk750_chip.*.

PATCH Superseded Elise Lennion 2 participants 2 messages Oct 11, 2016

Subsystems (2)
Staging Staging - silicon motion SM750 frame buffer driver

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Elise Lennion

author
#0 lore raw

PATCH 1/1 staging: sm750fb: Merge ddk750_help.* into ddk750_chip.*.

The file ddk750_help.c contained only one function declaration, so it was merged into ddk750_chip.c to simplify the driver.

Also, ddk750_help.h was merged into ddk750_chip.h to keep consistency.

Signed-off-by Elise Lennion <[email protected]>
---
 drivers/staging/sm750fb/Makefile         |  2 +-
 drivers/staging/sm750fb/ddk750.h         |  1 -
 drivers/staging/sm750fb/ddk750_chip.c    | 15 ++++++++++++++-
 drivers/staging/sm750fb/ddk750_chip.h    | 10 ++++++++++
 drivers/staging/sm750fb/ddk750_display.c |  2 +-
 drivers/staging/sm750fb/ddk750_dvi.c     |  2 +-
 drivers/staging/sm750fb/ddk750_help.c    | 17 -----------------
 drivers/staging/sm750fb/ddk750_help.h    | 21 ---------------------
 drivers/staging/sm750fb/ddk750_hwi2c.c   |  2 +-
 drivers/staging/sm750fb/ddk750_mode.c    |  1 -
 drivers/staging/sm750fb/ddk750_power.c   |  2 +-
 drivers/staging/sm750fb/ddk750_swi2c.c   |  2 +-
 12 files changed, 30 insertions(+), 47 deletions(-)
 delete mode 100644 drivers/staging/sm750fb/ddk750_help.c
 delete mode 100644 drivers/staging/sm750fb/ddk750_help.h
drivers/staging/sm750fb/Makefile +1 -1
index dcce3f4..4d781f7 100644
@@ -1,4 +1,4 @@
 obj-$(CONFIG_FB_SM750)	+= sm750fb.o
 
 sm750fb-objs		:= sm750.o sm750_hw.o sm750_accel.o sm750_cursor.o ddk750_chip.o ddk750_power.o ddk750_mode.o
-sm750fb-objs		+= ddk750_display.o ddk750_help.o ddk750_swi2c.o ddk750_sii164.o ddk750_dvi.o ddk750_hwi2c.o
+sm750fb-objs		+= ddk750_display.o ddk750_swi2c.o ddk750_sii164.o ddk750_dvi.o ddk750_hwi2c.o
drivers/staging/sm750fb/ddk750.h +0 -1
index 2c10a08..0566911 100644
@@ -16,7 +16,6 @@
 #include "ddk750_chip.h"
 #include "ddk750_display.h"
 #include "ddk750_power.h"
-#include "ddk750_help.h"
 #ifdef USE_HW_I2C
 #include "ddk750_hwi2c.h"
 #endif
drivers/staging/sm750fb/ddk750_chip.c +14 -1
index c62ebc1..6c02f1d 100644
@@ -1,13 +1,16 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 
-#include "ddk750_help.h"
 #include "ddk750_reg.h"
 #include "ddk750_chip.h"
 #include "ddk750_power.h"
 
 #define MHz(x) ((x) * 1000000)
 
+void __iomem *mmio750;
+char revId750;
+unsigned short devId750;
+
 logical_chip_type_t sm750_get_chip_type(void)
 {
 	unsigned short physicalID;

@@ -174,6 +177,16 @@ static void setMasterClock(unsigned int frequency)
 		}
 }
 
+/* after driver mapped io registers, use this function first */
+void ddk750_set_mmio(void __iomem *addr, unsigned short devId, char revId)
+{
+	mmio750 = addr;
+	devId750 = devId;
+	revId750 = revId;
+	if (revId == 0xfe)
+		pr_info("found sm750le\n");
+}
+
 unsigned int ddk750_getVMSize(void)
 {
 	unsigned int reg;
drivers/staging/sm750fb/ddk750_chip.h +10 -0
index a4ee359..d581495 100644
@@ -6,6 +6,16 @@
 #endif
 
 #include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/uaccess.h>
+
+/* software control endianness */
+#define PEEK32(addr) readl(addr + mmio750)
+#define POKE32(addr, data) writel(data, addr + mmio750)
+
+extern void __iomem *mmio750;
+extern char revId750;
+extern unsigned short devId750;
 
 /* This is all the chips recognized by this library */
 typedef enum _logical_chip_type_t {
drivers/staging/sm750fb/ddk750_display.c +1 -1
index 4023c476..aea9736 100644
@@ -1,5 +1,5 @@
 #include "ddk750_reg.h"
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_display.h"
 #include "ddk750_power.h"
 #include "ddk750_dvi.h"
drivers/staging/sm750fb/ddk750_dvi.c +1 -1
index 8252f77..250c2f4 100644
@@ -1,6 +1,6 @@
 #define USE_DVICHIP
 #ifdef USE_DVICHIP
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_dvi.h"
 #include "ddk750_sii164.h"
drivers/staging/sm750fb/ddk750_help.c deleted +0 -17
deleted file mode 100644
index e72a29c..0000000
@@ -1,17 +0,0 @@
-#include "ddk750_help.h"
-
-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)
-{
-	mmio750 = addr;
-	devId750 = devId;
-	revId750 = revId;
-	if (revId == 0xfe)
-		pr_info("found sm750le\n");
-}
-
-
drivers/staging/sm750fb/ddk750_help.h deleted +0 -21
deleted file mode 100644
index 009db92..0000000
@@ -1,21 +0,0 @@
-#ifndef DDK750_HELP_H__
-#define DDK750_HELP_H__
-#include "ddk750_chip.h"
-#ifndef USE_INTERNAL_REGISTER_ACCESS
-
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/uaccess.h>
-
-/* software control endianness */
-#define PEEK32(addr) readl(addr + mmio750)
-#define POKE32(addr, data) writel(data, addr + mmio750)
-
-extern void __iomem *mmio750;
-extern char revId750;
-extern unsigned short devId750;
-#else
-/* implement if you want use it*/
-#endif
-
-#endif
drivers/staging/sm750fb/ddk750_hwi2c.c +1 -1
index d391c12..4ce0fbe 100644
@@ -1,6 +1,6 @@
 #define USE_HW_I2C
 #ifdef USE_HW_I2C
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_hwi2c.h"
 #include "ddk750_power.h"
drivers/staging/sm750fb/ddk750_mode.c +0 -1
index 4bbf0c4..4964918 100644
@@ -1,5 +1,4 @@
 
-#include "ddk750_help.h"
 #include "ddk750_reg.h"
 #include "ddk750_mode.h"
 #include "ddk750_chip.h"
drivers/staging/sm750fb/ddk750_power.c +1 -1
index 7cc6169..710106e 100644
@@ -1,4 +1,4 @@
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_power.h"
drivers/staging/sm750fb/ddk750_swi2c.c +1 -1
index 72a4233..78bfba0 100644
@@ -10,7 +10,7 @@
 *  implementation.
 *
 *******************************************************************/
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_swi2c.h"
 #include "ddk750_power.h"
Signature · 1 line
2.7.4
maintainer
#1 lore raw
Quoted 51 lines · Elise Lennion

The file ddk750_help.c contained only one function declaration, so it was merged into ddk750_chip.c to simplify the driver.

Also, ddk750_help.h was merged into ddk750_chip.h to keep consistency.

Signed-off-by Elise Lennion <[email protected]>
---
 drivers/staging/sm750fb/Makefile         |  2 +-
 drivers/staging/sm750fb/ddk750.h         |  1 -
 drivers/staging/sm750fb/ddk750_chip.c    | 15 ++++++++++++++-
 drivers/staging/sm750fb/ddk750_chip.h    | 10 ++++++++++
 drivers/staging/sm750fb/ddk750_display.c |  2 +-
 drivers/staging/sm750fb/ddk750_dvi.c     |  2 +-
 drivers/staging/sm750fb/ddk750_help.c    | 17 -----------------
 drivers/staging/sm750fb/ddk750_help.h    | 21 ---------------------
 drivers/staging/sm750fb/ddk750_hwi2c.c   |  2 +-
 drivers/staging/sm750fb/ddk750_mode.c    |  1 -
 drivers/staging/sm750fb/ddk750_power.c   |  2 +-
 drivers/staging/sm750fb/ddk750_swi2c.c   |  2 +-
 12 files changed, 30 insertions(+), 47 deletions(-)
 delete mode 100644 drivers/staging/sm750fb/ddk750_help.c
 delete mode 100644 drivers/staging/sm750fb/ddk750_help.h
drivers/staging/sm750fb/Makefile +1 -1
index dcce3f4..4d781f7 100644
@@ -1,4 +1,4 @@
 obj-$(CONFIG_FB_SM750)	+= sm750fb.o
 
 sm750fb-objs		:= sm750.o sm750_hw.o sm750_accel.o sm750_cursor.o ddk750_chip.o ddk750_power.o ddk750_mode.o
-sm750fb-objs		+= ddk750_display.o ddk750_help.o ddk750_swi2c.o ddk750_sii164.o ddk750_dvi.o ddk750_hwi2c.o
+sm750fb-objs		+= ddk750_display.o ddk750_swi2c.o ddk750_sii164.o ddk750_dvi.o ddk750_hwi2c.o
drivers/staging/sm750fb/ddk750.h +0 -1
index 2c10a08..0566911 100644
@@ -16,7 +16,6 @@
 #include "ddk750_chip.h"
 #include "ddk750_display.h"
 #include "ddk750_power.h"
-#include "ddk750_help.h"
 #ifdef USE_HW_I2C
 #include "ddk750_hwi2c.h"
 #endif
drivers/staging/sm750fb/ddk750_chip.c +0 -0
index c62ebc1..6c02f1d 100644
@@ -1,13 +1,16 @@
 #include <linux/kernel.h>

drivers/staging/sm750fb/ddk750_chip.c line 10

Quoted 10 lines
drivers/staging/sm750fb/ddk750_chip.c +1 -1
 #include <linux/sizes.h>
 
-#include "ddk750_help.h"
 #include "ddk750_reg.h"
 #include "ddk750_chip.h"
 #include "ddk750_power.h"
 
 #define MHz(x) ((x) * 1000000)
 
+void __iomem *mmio750;

Yes, this needs to be as-is, to make the horrid macros work properly.

drivers/staging/sm750fb/ddk750_chip.c line 11

Quoted 1 line
drivers/staging/sm750fb/ddk750_chip.c +1 -0
+char revId750;

This variable can be static, right?

drivers/staging/sm750fb/ddk750_chip.c line 12

Quoted 1 line
drivers/staging/sm750fb/ddk750_chip.c +1 -0
+unsigned short devId750;

As can this one? And is this one even really needed?

Are either of them really needed?

thanks,

greg k-h