From 2836ee67b244fbf9ef24cb2c16de73e3622b8ab2 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Sat, 18 Nov 2023 23:03:09 +0100 Subject: [PATCH] [BOE panel driver] Fix for upstream change The .remove() callback again is expected to return void: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?id=cef3776d0b5ab3aa333fd41a23e011ca32a16ef4 Signed-off-by: MichaIng --- drivers/gpu/drm/panel/panel-boe-th101mb31ig002-28a.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-boe-th101mb31ig002-28a.c b/drivers/gpu/drm/panel/panel-boe-th101mb31ig002-28a.c index 37e33e90c28f5..422994cf5bd9a 100644 --- a/drivers/gpu/drm/panel/panel-boe-th101mb31ig002-28a.c +++ b/drivers/gpu/drm/panel/panel-boe-th101mb31ig002-28a.c @@ -354,19 +354,12 @@ static int boe_dsi_probe(struct mipi_dsi_device *dsi) return 0; } -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)) -static int boe_dsi_remove(struct mipi_dsi_device *dsi) -#else static void boe_dsi_remove(struct mipi_dsi_device *dsi) -#endif { struct boe *ctx = mipi_dsi_get_drvdata(dsi); mipi_dsi_detach(dsi); drm_panel_remove(&ctx->panel); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)) - return 0; -#endif } static const struct of_device_id boe_of_match[] = {