drm/tinydrm: Convert tinydrm_enable/disable_backlight to backlight_enable/disable

Remove tinydrm_enable/disable_backlight and let the callers call the
more generic backlight_enable/disable helpers

Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Meghana Madhyastha <meghana.madhyastha@gmail.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/ec700724e47814e6426966e093bd32b2364ba147.1516810725.git.meghana.madhyastha@gmail.com

2 files changed, 2 insertions, 57 deletions

diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
index bf96072d1b97..7326e1758bac 100644
--- a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
@@ -276,61 +276,6 @@ struct backlight_device *tinydrm_of_find_backlight(struct device *dev)
 }
 EXPORT_SYMBOL(tinydrm_of_find_backlight);
 
-/**
- * tinydrm_enable_backlight - Enable backlight helper
- * @backlight: Backlight device
- *
- * Returns:
- * Zero on success, negative error code on failure.
- */
-int tinydrm_enable_backlight(struct backlight_device *backlight)
-{
-        unsigned int old_state;
-        int ret;
-
-        if (!backlight)
-                return 0;
-
-        old_state = backlight->props.state;
-        backlight->props.state &= ~BL_CORE_FBBLANK;
-        DRM_DEBUG_KMS("Backlight state: 0x%x -> 0x%x\n", old_state,
-                      backlight->props.state);
-
-        ret = backlight_update_status(backlight);
-        if (ret)
-                DRM_ERROR("Failed to enable backlight %d\n", ret);
-
-        return ret;
-}
-EXPORT_SYMBOL(tinydrm_enable_backlight);
-
-/**
- * tinydrm_disable_backlight - Disable backlight helper
- * @backlight: Backlight device
- *
- * Returns:
- * Zero on success, negative error code on failure.
- */
-int tinydrm_disable_backlight(struct backlight_device *backlight)
-{
-        unsigned int old_state;
-        int ret;
-
-        if (!backlight)
-                return 0;
-
-        old_state = backlight->props.state;
-        backlight->props.state |= BL_CORE_FBBLANK;
-        DRM_DEBUG_KMS("Backlight state: 0x%x -> 0x%x\n", old_state,
-                      backlight->props.state);
-        ret = backlight_update_status(backlight);
-        if (ret)
-                DRM_ERROR("Failed to disable backlight %d\n", ret);
-
-        return ret;
-}
-EXPORT_SYMBOL(tinydrm_disable_backlight);
-
 #if IS_ENABLED(CONFIG_SPI)
 
 /**
diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c
index 75dd65c57e74..9e903812b573 100644
--- a/drivers/gpu/drm/tinydrm/mipi-dbi.c
+++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c
@@ -286,7 +286,7 @@ void mipi_dbi_enable_flush(struct mipi_dbi *mipi)
         if (fb)
                 fb->funcs->dirty(fb, NULL, 0, 0, NULL, 0);
 
-        tinydrm_enable_backlight(mipi->backlight);
+        backlight_enable(mipi->backlight);
 }
 EXPORT_SYMBOL(mipi_dbi_enable_flush);
 
@@ -325,7 +325,7 @@ void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe)
         mipi->enabled = false;
 
         if (mipi->backlight)
-                tinydrm_disable_backlight(mipi->backlight);
+                backlight_disable(mipi->backlight);
         else
                 mipi_dbi_blank(mipi);