Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / tiny / repaper.c

diff --git a/drivers/gpu/drm/tiny/repaper.c b/drivers/gpu/drm/tiny/repaper.c
index c7018dd..a096fb8 100644 (file)
--- a/drivers/gpu/drm/tiny/repaper.c
+++ b/drivers/gpu/drm/tiny/repaper.c
@@ -1118,14 +1118,12 @@ static int repaper_probe(struct spi_device *spi)
        return 0;
 }
 
-static int repaper_remove(struct spi_device *spi)
+static void repaper_remove(struct spi_device *spi)
 {
        struct drm_device *drm = spi_get_drvdata(spi);
 
        drm_dev_unplug(drm);
        drm_atomic_helper_shutdown(drm);
-
-       return 0;
 }
 
 static void repaper_shutdown(struct spi_device *spi)