[PATCH 1/2] auxdisplay: charlcd: move charlcd.h to drivers/auxdisplay

[PATCH 1/2] auxdisplay: charlcd: move charlcd.h to drivers/auxdisplay

[Masahiro Yamada]

This header is included in drivers/auxdisplay/. Make it a local header.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/auxdisplay/charlcd.c                   | 2 +-
 {include/misc => drivers/auxdisplay}/charlcd.h | 0
 drivers/auxdisplay/hd44780.c                   | 3 +--
 drivers/auxdisplay/panel.c                     | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename {include/misc => drivers/auxdisplay}/charlcd.h (100%)

diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c
index 92745efefb54..bef6b85778b6 100644
--- a/drivers/auxdisplay/charlcd.c
+++ b/drivers/auxdisplay/charlcd.c
@@ -20,7 +20,7 @@
 
 #include <generated/utsrelease.h>
 
-#include <misc/charlcd.h>
+#include "charlcd.h"
 
 #define LCD_MINOR		156
 
diff --git a/include/misc/charlcd.h b/drivers/auxdisplay/charlcd.h
similarity index 100%
rename from include/misc/charlcd.h
rename to drivers/auxdisplay/charlcd.h
diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c
index ab15b64707ad..bcbe13092327 100644
--- a/drivers/auxdisplay/hd44780.c
+++ b/drivers/auxdisplay/hd44780.c
@@ -14,8 +14,7 @@
 #include <linux/property.h>
 #include <linux/slab.h>
 
-#include <misc/charlcd.h>
-
+#include "charlcd.h"
 
 enum hd44780_pin {
 	/* Order does matter due to writing to GPIO array subsets! */
diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c
index e06de63497cf..f8ff18ba6889 100644
--- a/drivers/auxdisplay/panel.c
+++ b/drivers/auxdisplay/panel.c
@@ -55,7 +55,7 @@
 #include <linux/io.h>
 #include <linux/uaccess.h>
 
-#include <misc/charlcd.h>
+#include "charlcd.h"
 
 #define KEYPAD_MINOR		185
 
-- 
2.17.1

[PATCH 2/2] auxdisplay: charlcd: add include guard to charlcd.h

[Masahiro Yamada]

Add a header include guard just in case.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/auxdisplay/charlcd.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/auxdisplay/charlcd.h b/drivers/auxdisplay/charlcd.h
index 8cf6c18b0adb..00911ad0f3de 100644
--- a/drivers/auxdisplay/charlcd.h
+++ b/drivers/auxdisplay/charlcd.h
@@ -6,6 +6,9 @@
  * Copyright (C) 2016-2017 Glider bvba
  */
 
+#ifndef _CHARLCD_H
+#define _CHARLCD_H
+
 struct charlcd {
 	const struct charlcd_ops *ops;
 	const unsigned char *char_conv;	/* Optional */
@@ -37,3 +40,5 @@ int charlcd_register(struct charlcd *lcd);
 int charlcd_unregister(struct charlcd *lcd);
 
 void charlcd_poke(struct charlcd *lcd);
+
+#endif /* CHARLCD_H */
-- 
2.17.1

Re: [PATCH 1/2] auxdisplay: charlcd: move charlcd.h to drivers/auxdisplay

[Geert Uytterhoeven]

On Tue, Aug 6, 2019 at 9:16 AM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> This header is included in drivers/auxdisplay/. Make it a local header.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 2/2] auxdisplay: charlcd: add include guard to charlcd.h

[Miguel Ojeda]

On Tue, Aug 6, 2019 at 9:15 AM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> Add a header include guard just in case.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Picked it up, thanks!

Cheers,
Miguel

Re: [PATCH 1/2] auxdisplay: charlcd: move charlcd.h to drivers/auxdisplay

[Miguel Ojeda]

On Tue, Aug 6, 2019 at 9:18 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> On Tue, Aug 6, 2019 at 9:16 AM Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
> > This header is included in drivers/auxdisplay/. Make it a local header.
> >
> > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>

Picked it up, thanks!

Cheers,
Miguel