From 67dc782cf159e950af76c9d13766f7768c2077b1 Mon Sep 17 00:00:00 2001 From: Andrzej Hajda Date: Fri, 8 Jul 2016 13:11:58 +0200 Subject: [PATCH] drm/panel/s6e3ha2: simplify s6e3ha2_update_gamma s6e3ha2_update_gamma should update existing helpers to transfer data. Change-Id: I0d087c93ea854c27c0e9eb151ae01d0190c11497 Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/panel/panel-s6e3ha2.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-s6e3ha2.c b/drivers/gpu/drm/panel/panel-s6e3ha2.c index 03186e61b161..3d6683e2ae7a 100644 --- a/drivers/gpu/drm/panel/panel-s6e3ha2.c +++ b/drivers/gpu/drm/panel/panel-s6e3ha2.c @@ -521,24 +521,15 @@ static unsigned int s6e3ha2_get_brightness_index(unsigned int brightness) return (brightness * (NUM_GAMMA_STEPS - 1)) / MAX_BRIGHTNESS; } -static int s6e3ha2_update_gamma(struct s6e3ha2 *ctx, - unsigned int brightness) +static void s6e3ha2_update_gamma(struct s6e3ha2 *ctx, unsigned int brightness) { - struct backlight_device *bl_dev = ctx->bl_dev; - struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); unsigned int index = s6e3ha2_get_brightness_index(brightness); - int ret; - - ret = mipi_dsi_dcs_write(dsi, 0xca, gamma_tbl[index], - GAMMA_CMD_CNT); - if (ret < 0) - return ret; + s6e3ha2_dcs_write(ctx, 0xca, gamma_tbl[index], GAMMA_CMD_CNT); s6e3ha2_gamma_update(ctx); - bl_dev->props.brightness = brightness; - - return 0; + if (!ctx->error) + ctx->bl_dev->props.brightness = brightness; } static int s6e3ha2_set_brightness(struct backlight_device *bl_dev) @@ -560,9 +551,7 @@ static int s6e3ha2_set_brightness(struct backlight_device *bl_dev) } s6e3ha2_test_key_on_f0(ctx); - ret = s6e3ha2_update_gamma(ctx, brightness); - if (ret < 0) - return ret; + s6e3ha2_update_gamma(ctx, brightness); s6e3ha2_aor_control(ctx); s6e3ha2_set_vint(ctx); -- 2.34.1