This patch wraps the relevant code blocks with `IS_ENABLED(CONFIG_FB_DEVICE)`.

Allows the driver to be used for framebuffer text console, even if
support for the /dev/fb device isn't compiled-in (CONFIG_FB_DEVICE=n).

This align with Documentation/drm/todo.rst
"Remove driver dependencies on FB_DEVICE"

I've not the card so I was not able to test it.

Signed-off-by: Javier Garcia <[email protected]>
---
v2 -> v3:
      * Change commit msg , thanks Helge Deller.
      * Delete not used include , thanks Uwe Kleine-Koenig.
      * v1 
https://lore.kernel.org/lkml/[email protected]/
v1 -> v2:
      * Fix error and improvement , thanks Uwe Kleine-Koenig.
      * v1 
https://lore.kernel.org/lkml/[email protected]

 drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c 
b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
index ade88e7bc760..3f79dfc27a53 100644
--- a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
@@ -759,7 +759,7 @@ static int of_platform_mb862xx_probe(struct platform_device 
*ofdev)
 
        dev_set_drvdata(dev, info);
 
-       if (device_create_file(dev, &dev_attr_dispregs))
+       if (IS_ENABLED(CONFIG_FB_DEVICE) && device_create_file(dev, 
&dev_attr_dispregs))
                dev_err(dev, "Can't create sysfs regdump file\n");
        return 0;
 
@@ -801,7 +801,8 @@ static void of_platform_mb862xx_remove(struct 
platform_device *ofdev)
        free_irq(par->irq, (void *)par);
        irq_dispose_mapping(par->irq);
 
-       device_remove_file(&ofdev->dev, &dev_attr_dispregs);
+       if (IS_ENABLED(CONFIG_FB_DEVICE))
+               device_remove_file(&ofdev->dev, &dev_attr_dispregs);
 
        unregister_framebuffer(fbi);
        fb_dealloc_cmap(&fbi->cmap);
@@ -1101,7 +1102,7 @@ static int mb862xx_pci_probe(struct pci_dev *pdev,
 
        pci_set_drvdata(pdev, info);
 
-       if (device_create_file(dev, &dev_attr_dispregs))
+       if (IS_ENABLED(CONFIG_FB_DEVICE) && device_create_file(dev, 
&dev_attr_dispregs))
                dev_err(dev, "Can't create sysfs regdump file\n");
 
        if (par->type == BT_CARMINE)
@@ -1151,7 +1152,8 @@ static void mb862xx_pci_remove(struct pci_dev *pdev)
 
        mb862xx_i2c_exit(par);
 
-       device_remove_file(&pdev->dev, &dev_attr_dispregs);
+       if (IS_ENABLED(CONFIG_FB_DEVICE))
+               device_remove_file(&pdev->dev, &dev_attr_dispregs);
 
        unregister_framebuffer(fbi);
        fb_dealloc_cmap(&fbi->cmap);
-- 
2.50.1

Reply via email to