All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: sm750fb: Merge ddk750_help.* into ddk750_chip.*.
@ 2016-10-11  0:09 Elise Lennion
  2016-10-11  6:13 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Elise Lennion @ 2016-10-11  0:09 UTC (permalink / raw)
  To: sudipm.mukherjee, teddy.wang, gregkh, outreachy-kernel

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 <elise.lennion@gmail.com>
---
 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

diff --git a/drivers/staging/sm750fb/Makefile b/drivers/staging/sm750fb/Makefile
index dcce3f4..4d781f7 100644
--- a/drivers/staging/sm750fb/Makefile
+++ b/drivers/staging/sm750fb/Makefile
@@ -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
diff --git a/drivers/staging/sm750fb/ddk750.h b/drivers/staging/sm750fb/ddk750.h
index 2c10a08..0566911 100644
--- a/drivers/staging/sm750fb/ddk750.h
+++ b/drivers/staging/sm750fb/ddk750.h
@@ -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
diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c
index c62ebc1..6c02f1d 100644
--- a/drivers/staging/sm750fb/ddk750_chip.c
+++ b/drivers/staging/sm750fb/ddk750_chip.c
@@ -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;
diff --git a/drivers/staging/sm750fb/ddk750_chip.h b/drivers/staging/sm750fb/ddk750_chip.h
index a4ee359..d581495 100644
--- a/drivers/staging/sm750fb/ddk750_chip.h
+++ b/drivers/staging/sm750fb/ddk750_chip.h
@@ -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 {
diff --git a/drivers/staging/sm750fb/ddk750_display.c b/drivers/staging/sm750fb/ddk750_display.c
index 4023c476..aea9736 100644
--- a/drivers/staging/sm750fb/ddk750_display.c
+++ b/drivers/staging/sm750fb/ddk750_display.c
@@ -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"
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c b/drivers/staging/sm750fb/ddk750_dvi.c
index 8252f77..250c2f4 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -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"
diff --git a/drivers/staging/sm750fb/ddk750_help.c b/drivers/staging/sm750fb/ddk750_help.c
deleted file mode 100644
index e72a29c..0000000
--- a/drivers/staging/sm750fb/ddk750_help.c
+++ /dev/null
@@ -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");
-}
-
-
diff --git a/drivers/staging/sm750fb/ddk750_help.h b/drivers/staging/sm750fb/ddk750_help.h
deleted file mode 100644
index 009db92..0000000
--- a/drivers/staging/sm750fb/ddk750_help.h
+++ /dev/null
@@ -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
diff --git a/drivers/staging/sm750fb/ddk750_hwi2c.c b/drivers/staging/sm750fb/ddk750_hwi2c.c
index d391c12..4ce0fbe 100644
--- a/drivers/staging/sm750fb/ddk750_hwi2c.c
+++ b/drivers/staging/sm750fb/ddk750_hwi2c.c
@@ -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"
diff --git a/drivers/staging/sm750fb/ddk750_mode.c b/drivers/staging/sm750fb/ddk750_mode.c
index 4bbf0c4..4964918 100644
--- a/drivers/staging/sm750fb/ddk750_mode.c
+++ b/drivers/staging/sm750fb/ddk750_mode.c
@@ -1,5 +1,4 @@
 
-#include "ddk750_help.h"
 #include "ddk750_reg.h"
 #include "ddk750_mode.h"
 #include "ddk750_chip.h"
diff --git a/drivers/staging/sm750fb/ddk750_power.c b/drivers/staging/sm750fb/ddk750_power.c
index 7cc6169..710106e 100644
--- a/drivers/staging/sm750fb/ddk750_power.c
+++ b/drivers/staging/sm750fb/ddk750_power.c
@@ -1,4 +1,4 @@
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_power.h"
 
diff --git a/drivers/staging/sm750fb/ddk750_swi2c.c b/drivers/staging/sm750fb/ddk750_swi2c.c
index 72a4233..78bfba0 100644
--- a/drivers/staging/sm750fb/ddk750_swi2c.c
+++ b/drivers/staging/sm750fb/ddk750_swi2c.c
@@ -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"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH] staging: sm750fb: Merge ddk750_help.* into ddk750_chip.*.
  2016-10-11  0:09 [PATCH] staging: sm750fb: Merge ddk750_help.* into ddk750_chip.* Elise Lennion
@ 2016-10-11  6:13 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2016-10-11  6:13 UTC (permalink / raw)
  To: Elise Lennion; +Cc: sudipm.mukherjee, teddy.wang, outreachy-kernel

On Mon, Oct 10, 2016 at 09:09:55PM -0300, Elise Lennion wrote:
> 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 <elise.lennion@gmail.com>
> ---
>  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
> 
> diff --git a/drivers/staging/sm750fb/Makefile b/drivers/staging/sm750fb/Makefile
> index dcce3f4..4d781f7 100644
> --- a/drivers/staging/sm750fb/Makefile
> +++ b/drivers/staging/sm750fb/Makefile
> @@ -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
> diff --git a/drivers/staging/sm750fb/ddk750.h b/drivers/staging/sm750fb/ddk750.h
> index 2c10a08..0566911 100644
> --- a/drivers/staging/sm750fb/ddk750.h
> +++ b/drivers/staging/sm750fb/ddk750.h
> @@ -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
> diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c
> index c62ebc1..6c02f1d 100644
> --- a/drivers/staging/sm750fb/ddk750_chip.c
> +++ b/drivers/staging/sm750fb/ddk750_chip.c
> @@ -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;

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

> +char revId750;

This variable can be static, right?

> +unsigned short devId750;

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

Are either of them really needed?

thanks,

greg k-h


^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-11  6:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-11  0:09 [PATCH] staging: sm750fb: Merge ddk750_help.* into ddk750_chip.* Elise Lennion
2016-10-11  6:13 ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.