Commit 447794e4 authored by Gonzalo Silvalde Blanco's avatar Gonzalo Silvalde Blanco Committed by Helge Deller
Browse files

fbdev: sstfb: Make CONFIG_FB_DEVICE optional 

The sstfb driver currently depends on CONFIG_FB_DEVICE to create sysfs
entries and access info->dev. This patch wraps the relevant code blocks
with #ifdef CONFIG_FB_DEVICE, allowing the driver to be built and used
even if CONFIG_FB_DEVICE is not selected.

The sysfs setting only controls the VGA pass-through state and is not
required for the display to work correctly.
(See: http://vogonswiki.com/index.php/VGA_passthrough_cable


for more information.)

Added some fixes from Thomas Zimmermann.

Signed-off-by: default avatarGonzalo Silvalde Blanco <gonzalo.silvalde@gmail.com>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 8e929cb5

drivers/video/fbdev/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1236,7 +1236,6 @@ config FB_3DFX_I2C 
config FB_VOODOO1

	tristate "3Dfx Voodoo Graphics (sst1) support"

	depends on FB && PCI

	depends on FB_DEVICE

	select FB_IOMEM_HELPERS

	help

	  Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or

drivers/video/fbdev/sstfb.c

+7 −2
Original line number Diff line number Diff line
@@ -716,6 +716,7 @@ static void sstfb_setvgapass( struct fb_info *info, int enable ) 
	pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp);

}



#ifdef CONFIG_FB_DEVICE

static ssize_t store_vgapass(struct device *device, struct device_attribute *attr,

			const char *buf, size_t count)

{
@@ -740,6 +741,7 @@ static ssize_t show_vgapass(struct device *device, struct device_attribute *attr 
static struct device_attribute device_attrs[] = {

	__ATTR(vgapass, S_IRUGO|S_IWUSR, show_vgapass, store_vgapass)

};

#endif



static int sstfb_ioctl(struct fb_info *info, unsigned int cmd,

			unsigned long arg)
@@ -1436,9 +1438,10 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	sstfb_clear_screen(info);



#ifdef CONFIG_FB_DEVICE

	if (device_create_file(info->dev, &device_attrs[0]))

		printk(KERN_WARNING "sstfb: can't create sysfs entry.\n");



#endif



	fb_info(info, "%s frame buffer device at 0x%p\n",

		fix->id, info->screen_base);
@@ -1468,7 +1471,9 @@ static void sstfb_remove(struct pci_dev *pdev) 
	info = pci_get_drvdata(pdev);

	par = info->par;



#ifdef CONFIG_FB_DEVICE

	device_remove_file(info->dev, &device_attrs[0]);

#endif

	sst_shutdown(info);

	iounmap(info->screen_base);

	iounmap(par->mmio_vbase);