Unverified Commit f178e96d authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Arnd Bergmann
Browse files

arch: Remove struct fb_info from video helpers 



The per-architecture video helpers do not depend on struct fb_info
or anything else from fbdev. Remove it from the interface and replace
fb_is_primary_device() with video_is_primary_device(). The new helper
is similar in functionality, but can operate on non-fbdev devices.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f25eae2c

arch/parisc/include/asm/fb.h

+5 −3
Original line number Diff line number Diff line
@@ -2,11 +2,13 @@ 
#ifndef _ASM_FB_H_

#define _ASM_FB_H_



struct fb_info;

#include <linux/types.h>



struct device;



#if defined(CONFIG_STI_CORE)

int fb_is_primary_device(struct fb_info *info);

#define fb_is_primary_device fb_is_primary_device

bool video_is_primary_device(struct device *dev);

#define video_is_primary_device video_is_primary_device

#endif



#include <asm-generic/fb.h>

arch/parisc/video/fbdev.c

+5 −4
Original line number Diff line number Diff line
@@ -5,12 +5,13 @@ 
 * Copyright (C) 2001-2002 Thomas Bogendoerfer <tsbogend@alpha.franken.de>

 */



#include <linux/fb.h>

#include <linux/module.h>



#include <video/sticore.h>



int fb_is_primary_device(struct fb_info *info)

#include <asm/fb.h>



bool video_is_primary_device(struct device *dev)

{

	struct sti_struct *sti;
@@ -21,6 +22,6 @@ int fb_is_primary_device(struct fb_info *info) 
		return true;



	/* return true if it's the default built-in framebuffer driver */

	return (sti->dev == info->device);

	return (sti->dev == dev);

}

EXPORT_SYMBOL(fb_is_primary_device);
 
EXPORT_SYMBOL(video_is_primary_device);

arch/sparc/include/asm/fb.h

+4 −3
Original line number Diff line number Diff line
@@ -3,10 +3,11 @@ 
#define _SPARC_FB_H_



#include <linux/io.h>

#include <linux/types.h>



#include <asm/page.h>



struct fb_info;

struct device;



#ifdef CONFIG_SPARC32

static inline pgprot_t pgprot_framebuffer(pgprot_t prot,
@@ -18,8 +19,8 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, 
#define pgprot_framebuffer pgprot_framebuffer

#endif



int fb_is_primary_device(struct fb_info *info);

#define fb_is_primary_device fb_is_primary_device

bool video_is_primary_device(struct device *dev);

#define video_is_primary_device video_is_primary_device



static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)

{

arch/sparc/video/fbdev.c

+8 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/console.h>

#include <linux/fb.h>

#include <linux/device.h>

#include <linux/module.h>



#include <asm/fb.h>

#include <asm/prom.h>



int fb_is_primary_device(struct fb_info *info)

bool video_is_primary_device(struct device *dev)

{

	struct device *dev = info->device;

	struct device_node *node;

	struct device_node *node = dev->of_node;



	if (console_set_on_cmdline)

		return 0;

		return false;



	node = dev->of_node;

	if (node && node == of_console_device)

		return 1;

		return true;



	return 0;

	return false;

}

EXPORT_SYMBOL(fb_is_primary_device);

EXPORT_SYMBOL(video_is_primary_device);



MODULE_DESCRIPTION("Sparc fbdev helpers");

MODULE_LICENSE("GPL");

arch/x86/include/asm/fb.h

+5 −3
Original line number Diff line number Diff line
@@ -2,17 +2,19 @@ 
#ifndef _ASM_X86_FB_H

#define _ASM_X86_FB_H



#include <linux/types.h>



#include <asm/page.h>



struct fb_info;

struct device;



pgprot_t pgprot_framebuffer(pgprot_t prot,

			    unsigned long vm_start, unsigned long vm_end,

			    unsigned long offset);

#define pgprot_framebuffer pgprot_framebuffer



int fb_is_primary_device(struct fb_info *info);

#define fb_is_primary_device fb_is_primary_device

bool video_is_primary_device(struct device *dev);

#define video_is_primary_device video_is_primary_device



#include <asm-generic/fb.h>