From 66019bc26d2bc9a549a71ec0b4e51f24f5db2fcf Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 7 Jun 2019 14:38:07 +0200 Subject: video: fbdev: cyber2000fb: remove superfluous CONFIG_PCI ifdef This is a PCI driver and FB_CYBER2000 depends on PCI in Kconfig so there is no need to check for PCI inside the driver code. Cc: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/video/fbdev/cyber2000fb.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'drivers/video/fbdev/cyber2000fb.c') diff --git a/drivers/video/fbdev/cyber2000fb.c b/drivers/video/fbdev/cyber2000fb.c index 9a5751cb4e16..897f4c702398 100644 --- a/drivers/video/fbdev/cyber2000fb.c +++ b/drivers/video/fbdev/cyber2000fb.c @@ -1641,10 +1641,6 @@ static void cyberpro_common_resume(struct cfb_info *cfb) cyber2000fb_set_par(&cfb->fb); } -/* - * PCI specific support. - */ -#ifdef CONFIG_PCI /* * We need to wake up the CyberPro, and make sure its in linear memory * mode. Unfortunately, this is specific to the platform and card that @@ -1861,7 +1857,6 @@ static struct pci_driver cyberpro_driver = { .resume = cyberpro_pci_resume, .id_table = cyberpro_pci_table }; -#endif /* * I don't think we can use the "module_init" stuff here because -- cgit v1.2.3 From 561f1f6e023bd548f1d24f80502eb6c075f2a467 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 28 May 2019 11:02:37 +0200 Subject: fbdev/cyber2000: Remove struct display Entirely unused. Signed-off-by: Daniel Vetter Reviewed-by: Sam Ravnborg Reviewed-by: Maarten Lankhorst Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-7-daniel.vetter@ffwll.ch --- drivers/video/fbdev/cyber2000fb.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/video/fbdev/cyber2000fb.c') diff --git a/drivers/video/fbdev/cyber2000fb.c b/drivers/video/fbdev/cyber2000fb.c index 9a5751cb4e16..452ef07b3a06 100644 --- a/drivers/video/fbdev/cyber2000fb.c +++ b/drivers/video/fbdev/cyber2000fb.c @@ -61,7 +61,6 @@ struct cfb_info { struct fb_info fb; struct display_switch *dispsw; - struct display *display; unsigned char __iomem *region; unsigned char __iomem *regs; u_int id; -- cgit v1.2.3