Commit dae7fbf4 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

driver/ps3: Include <video/cmdline.h> for mode parsing 



Include <video/cmdline.h> in ps3av.c to get video_get_options() and
avoid the dependency on <linux/fb.h>. The replaced function
fb_get_options() is just a tiny wrapper around video_get_opions(). No
functional changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230209135509.7786-10-tzimmermann@suse.de
parent 93604a5a

drivers/ps3/ps3av.c

+6 −12
Original line number Diff line number Diff line
@@ -11,13 +11,14 @@ 
#include <linux/delay.h>

#include <linux/notifier.h>

#include <linux/ioctl.h>

#include <linux/fb.h>

#include <linux/slab.h>



#include <asm/firmware.h>

#include <asm/ps3av.h>

#include <asm/ps3.h>



#include <video/cmdline.h>



#include "vuart.h"



#define BUFSIZE          4096	/* vuart buf size */
@@ -921,9 +922,7 @@ EXPORT_SYMBOL_GPL(ps3av_audio_mute); 


static int ps3av_probe(struct ps3_system_bus_device *dev)

{

#ifdef CONFIG_FB

	char *mode_option = NULL;

#endif

	const char *mode_option;

	int res;

	int id;
@@ -971,14 +970,9 @@ static int ps3av_probe(struct ps3_system_bus_device *dev) 


	ps3av_get_hw_conf(ps3av);



#ifdef CONFIG_FB

	fb_get_options(NULL, &mode_option);

	if (mode_option) {

		if (!strcmp(mode_option, "safe"))

	mode_option = video_get_options(NULL);

	if (mode_option && !strcmp(mode_option, "safe"))

		safe_mode = 1;

		kfree(mode_option);

	}

#endif /* CONFIG_FB */

	id = ps3av_auto_videomode(&ps3av->av_hw_conf);

	if (id < 0) {

		printk(KERN_ERR "%s: invalid id :%d\n", __func__, id);