video/aperture: Disable and unregister sysfb devices via aperture helpers

[platform/kernel/linux-starfive.git] / drivers / video / fbdev / core / fbmem.c

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index c8f9532..4ed0960 100644 (file)
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -19,7 +19,6 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/slab.h>
-#include <linux/sysfb.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
 #include <linux/vt.h>
@@ -1777,17 +1776,6 @@ int remove_conflicting_framebuffers(struct apertures_struct *a,
                do_free = true;
        }
 
-       /*
-        * If a driver asked to unregister a platform device registered by
-        * sysfb, then can be assumed that this is a driver for a display
-        * that is set up by the system firmware and has a generic driver.
-        *
-        * Drivers for devices that don't have a generic driver will never
-        * ask for this, so let's assume that a real driver for the display
-        * was already probed and prevent sysfb to register devices later.
-        */
-       sysfb_disable();
-
        mutex_lock(&registration_lock);
        do_remove_conflicting_framebuffers(a, name, primary);
        mutex_unlock(&registration_lock);