[PATCH] s390: use generic fb.h

[PATCH] s390: use generic fb.h

[Tobias Klauser]

The arch uses a verbatim copy of the asm-generic version and does not
add any own implemntations to the header, so use asm-generic/fb.h
instead of duplicating code.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 arch/s390/include/asm/Kbuild |  1 +
 arch/s390/include/asm/fb.h   | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 arch/s390/include/asm/fb.h

diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 45092b12f54f..953315cc37c4 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -5,6 +5,7 @@ generic-y += dma-contiguous.h
 generic-y += div64.h
 generic-y += emergency-restart.h
 generic-y += export.h
+generic-y += fb.h
 generic-y += irq_regs.h
 generic-y += irq_work.h
 generic-y += kmap_types.h
diff --git a/arch/s390/include/asm/fb.h b/arch/s390/include/asm/fb.h
deleted file mode 100644
index c7df38030992..000000000000
--- a/arch/s390/include/asm/fb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-#include <linux/fb.h>
-
-#define fb_pgprotect(...) do {} while (0)
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-	return 0;
-}
-
-#endif /* _ASM_FB_H_ */
-- 
2.13.0

Re: [PATCH] s390: use generic fb.h

[Heiko Carstens]

On Wed, May 17, 2017 at 10:34:49AM +0200, Tobias Klauser wrote:
> The arch uses a verbatim copy of the asm-generic version and does not
> add any own implemntations to the header, so use asm-generic/fb.h
> instead of duplicating code.
> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> ---
>  arch/s390/include/asm/Kbuild |  1 +
>  arch/s390/include/asm/fb.h   | 12 ------------
>  2 files changed, 1 insertion(+), 12 deletions(-)
>  delete mode 100644 arch/s390/include/asm/fb.h

Thanks, however a similar patch which addresses this and yet another
header file is available in our features branch, which should be part
of linux-next soon:

https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=features&id=b14b748a1df95a91207ba34981c9a51061b8c93d