From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6D1747012A for ; Wed, 12 Aug 2026 15:25:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786548350; cv=none; b=YhCVTLltP9G0x7gc6FfijD8SKjg3TD/2VC7b9j05BnC+m77/btS0qRtUjOL56PU6tfxiSS8Azyp6/rcfFNehzWFnZuGyAgx564T5t0pbUbFXoJvHBdaSBXwQNAtWiYWB5DvwSOF+2uSkGYV14eN6b5fPJ/uNq9mlfzlKOhJC5go= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786548350; c=relaxed/simple; bh=cn4NTP1QiYeBywJdRXP3nH0g9PSqpnnKouCE/yuffrA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pgF8hdSK+qTvdLuO06Z6dvGICfRo/OcSU88I2My+5zPZkFF9qpKWgN536wLFtZsXHAHlOtqgiezXDJE7dOFTlMTvho7+fWKS6PrUT2uPw7gv+FdwYaDqCoYTOVyW8KRJQ0WmzQQWLJH7hRgOaqmrmmlq26UWgho7F6KoMjAa66w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=sCuoV+uB; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sCuoV+uB" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-49558ce01afso8794555e9.1 for ; Wed, 12 Aug 2026 08:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786548340; x=1787153140; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=wfTH8vbaXGIf/GnQTUx9ai499PuDRzTf4vsluIY8QD0=; b=sCuoV+uBqjKdyLcmU1Wq3DPq3LJ7zgwRbjKjYxXxqVlBE4usUu3ZpNEpUNAdV4Qqrg AHedw/2HpfQz0xt8oSvyKiDJCyiNxoOC2UmM54xHS1qpLks215cSQBsM0RsJxD0Kgy2v /PhEhnurMnAFzCTNmPWVq9we1OPCQTd+Iiy/dM7i0IPcpveCF1oABqpYdV5cJOL3MAoG XtydtckFehFJB8ntakecIOfCKJZ/NTXWecj4UwoHXKr5q0iLNz4RRydqABnzq6ewWHB/ E7Kg9sTSNfos6KGqp9U3qZANyvfoS210GYb6X6RWldckQb9aXcUVUjEwISmaJ9jitfMC XWhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786548340; x=1787153140; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=wfTH8vbaXGIf/GnQTUx9ai499PuDRzTf4vsluIY8QD0=; b=dT+ShIOrtcGmJj6gXulmNuVyBAi6r00AiOKdW1Yn3Sb/zCrp3VGDnz3phSNNbASkrx epdac56MPDLyMwyZ684vkjEF4bijuuF+vbxi9JEDrVNHXR9YUD2uDuJSNvCFiRXVQIdo Imm0W8NXaHTREEoE7LEXF8RRo0HP07qt+eN3ZfGjUCyzVEp4Beqagh7gveqGLBLqBVQ1 tdkCRJwq1wBQF5hu6f0q0FFy7Ob5xUZtPsaDVSl+S7XNtc/j5IlMOYSm+0+0tsRx4lfB /dWR4LZDxcqPRvDoCOyXEtD/LT7m9qHK5VRY8adJy9R7w/Gg+6Bfvy5LATuoaJ5T1PC0 i0lw== X-Forwarded-Encrypted: i=1; AHgh+Rrg2DmogexghES6kRpL6Si7X7bJnChiOvQgkG5H6N8+pvRWzfIKX32Bt0/yBI3JOUamGcvaeItYg+El9GA=@vger.kernel.org X-Gm-Message-State: AOJu0YyAjWij25kLrxlf7/yRP/3enlMinNR0SR5MqLpxC8WrL1LBubXD b6qaQFqdrh4d9AsghVHMDqVcZCl06fpwnQrbULlNMN3IEHUL96fu8hsE+RcPuPHu X-Gm-Gg: AR+sD124q91CoVXV64dCF3jn4iwhJs/ddAP1/sU66W5GP/v8PAqdCjBez+fz/mnJ0wc 7Xk28wE0Dw4Wav36T+Y57LhvFfU1vo/H1oD+0996TboUIJJcLpSErbyKx2XlfPg9fBqK9C05LuD BL1kz3LqhdudgGh7LxBESDE5NKbPtW2HM3T79nGtN/OdCPNPsMGWc+RO1az+iSBPRNygpgi9d2b IFK1h9ht9P/LDG+mDFPKqijRhIzSL6gLCGlBZa0F88h98fqNX4ow1oR2OuJ2T/dVVC/YTcMuGze lhIx1pDKgnRQMLdkWpSc0pGRoLOikGnm9Dw1ryz2f4M+8nM8uGzqJuSYr9J3ZrXk03xz0FfTRhM Mw9Ujz2KaZhRSjeizepaVE4R3IPlKO0trBQshIGFI/e2XpYA7J3foTDeHGe40Z7YcVjN6pOCbfh D/GNHnJ6eOAq+E5OKtb+6IIF8gNhaXx2qOopmYIEYEwB1ypbj3oQumjvW45w9g+66O+9WuWWk81 +bfpVn5XY4TKQGZqHzrtpVTnw== X-Received: by 2002:a05:600c:1d0c:b0:495:7a5a:d96c with SMTP id 5b1f17b1804b1-4997c163b3fmr74381825e9.18.1786548340020; Wed, 12 Aug 2026 08:25:40 -0700 (PDT) Received: from osama.. ([2a02:908:185:7e40:3d2e:78f3:cfb2:413d]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49977e882d8sm91268885e9.4.2026.08.12.08.25.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 08:25:39 -0700 (PDT) From: Osama Abdelkader To: luca.ceresoli@bootlin.com, Neil Armstrong , Jessica Zhang , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Osama Abdelkader Subject: [PATCH v4 5/6] drm/panel: Use managed helpers in display vendor panels Date: Wed, 12 Aug 2026 17:25:33 +0200 Message-ID: <20260812152535.82238-1-osama.abdelkader@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use the managed MIPI DSI attach and panel add helpers in display vendor panel drivers and drop the corresponding manual detach and panel remove calls from remove paths. Suggested-by: Luca Ceresoli Signed-off-by: Osama Abdelkader --- v4: - use devm_drm_panel_add instead of drm_panel_add. drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 19 +++-------- .../gpu/drm/panel/panel-jdi-lt070me05000.c | 32 ++----------------- .../drm/panel/panel-leadtek-ltk050h3146w.c | 20 +++--------- .../drm/panel/panel-leadtek-ltk500hd1829.c | 20 +++--------- .../gpu/drm/panel/panel-sharp-ls043t1le01.c | 31 ++---------------- .../gpu/drm/panel/panel-sharp-ls060t1sx01.c | 20 +++--------- drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 20 +++--------- .../panel/panel-sony-tulip-truly-nt35521.c | 20 +++--------- drivers/gpu/drm/panel/panel-visionox-r66451.c | 23 +++---------- .../gpu/drm/panel/panel-visionox-rm69299.c | 21 +++--------- 10 files changed, 38 insertions(+), 188 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c b/drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c index cbe354b51bce..caf18d309849 100644 --- a/drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c +++ b/drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c @@ -200,9 +200,11 @@ static int jdi_fhd_r63452_probe(struct mipi_dsi_device *dsi) if (ret) return dev_err_probe(dev, ret, "Failed to get backlight\n"); - drm_panel_add(&ctx->panel); + ret = devm_drm_panel_add(dev, &ctx->panel); + if (ret) + return ret; - ret = mipi_dsi_attach(dsi); + ret = devm_mipi_dsi_attach(dev, dsi); if (ret < 0) { dev_err(dev, "Failed to attach to DSI host: %d\n", ret); return ret; @@ -211,18 +213,6 @@ static int jdi_fhd_r63452_probe(struct mipi_dsi_device *dsi) return 0; } -static void jdi_fhd_r63452_remove(struct mipi_dsi_device *dsi) -{ - struct jdi_fhd_r63452 *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); - - drm_panel_remove(&ctx->panel); -} - static const struct of_device_id jdi_fhd_r63452_of_match[] = { { .compatible = "jdi,fhd-r63452" }, { /* sentinel */ } @@ -231,7 +221,6 @@ MODULE_DEVICE_TABLE(of, jdi_fhd_r63452_of_match); static struct mipi_dsi_driver jdi_fhd_r63452_driver = { .probe = jdi_fhd_r63452_probe, - .remove = jdi_fhd_r63452_remove, .driver = { .name = "panel-jdi-fhd-r63452", .of_match_table = jdi_fhd_r63452_of_match, diff --git a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c index 01bd748aecec..e91b41743bec 100644 --- a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c +++ b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c @@ -345,15 +345,7 @@ static int jdi_panel_add(struct jdi_panel *jdi) return dev_err_probe(dev, PTR_ERR(jdi->backlight), "failed to register backlight %d\n", ret); - drm_panel_add(&jdi->base); - - return 0; -} - -static void jdi_panel_del(struct jdi_panel *jdi) -{ - if (jdi->base.dev) - drm_panel_remove(&jdi->base); + return devm_drm_panel_add(dev, &jdi->base); } static int jdi_panel_probe(struct mipi_dsi_device *dsi) @@ -380,26 +372,7 @@ static int jdi_panel_probe(struct mipi_dsi_device *dsi) if (ret < 0) return ret; - ret = mipi_dsi_attach(dsi); - if (ret < 0) { - jdi_panel_del(jdi); - return ret; - } - - return 0; -} - -static void jdi_panel_remove(struct mipi_dsi_device *dsi) -{ - struct jdi_panel *jdi = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", - ret); - - jdi_panel_del(jdi); + return devm_mipi_dsi_attach(&dsi->dev, dsi); } static struct mipi_dsi_driver jdi_panel_driver = { @@ -408,7 +381,6 @@ static struct mipi_dsi_driver jdi_panel_driver = { .of_match_table = jdi_of_match, }, .probe = jdi_panel_probe, - .remove = jdi_panel_remove, }; module_mipi_dsi_driver(jdi_panel_driver); diff --git a/drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c b/drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c index 0856df5a6ee2..8a02e92061f5 100644 --- a/drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c +++ b/drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c @@ -583,30 +583,19 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi) if (ret) return ret; - drm_panel_add(&ctx->panel); + ret = devm_drm_panel_add(dev, &ctx->panel); + if (ret) + return ret; - ret = mipi_dsi_attach(dsi); + ret = devm_mipi_dsi_attach(dev, dsi); if (ret < 0) { dev_err(dev, "mipi_dsi_attach failed: %d\n", ret); - drm_panel_remove(&ctx->panel); return ret; } return 0; } -static void ltk050h3146w_remove(struct mipi_dsi_device *dsi) -{ - struct ltk050h3146w *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); - - drm_panel_remove(&ctx->panel); -} - static const struct of_device_id ltk050h3146w_of_match[] = { { .compatible = "leadtek,ltk050h3146w", @@ -630,7 +619,6 @@ static struct mipi_dsi_driver ltk050h3146w_driver = { .of_match_table = ltk050h3146w_of_match, }, .probe = ltk050h3146w_probe, - .remove = ltk050h3146w_remove, }; module_mipi_dsi_driver(ltk050h3146w_driver); diff --git a/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c b/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c index 7f19fd5b8060..ff35b62a327e 100644 --- a/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c +++ b/drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c @@ -649,30 +649,19 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi) if (ret) return ret; - drm_panel_add(&ctx->panel); + ret = devm_drm_panel_add(dev, &ctx->panel); + if (ret) + return ret; - ret = mipi_dsi_attach(dsi); + ret = devm_mipi_dsi_attach(dev, dsi); if (ret < 0) { dev_err(dev, "mipi_dsi_attach failed: %d\n", ret); - drm_panel_remove(&ctx->panel); return ret; } return 0; } -static void ltk500hd1829_remove(struct mipi_dsi_device *dsi) -{ - struct ltk500hd1829 *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret); - - drm_panel_remove(&ctx->panel); -} - static const struct of_device_id ltk500hd1829_of_match[] = { { .compatible = "leadtek,ltk101b4029w", @@ -692,7 +681,6 @@ static struct mipi_dsi_driver ltk500hd1829_driver = { .of_match_table = ltk500hd1829_of_match, }, .probe = ltk500hd1829_probe, - .remove = ltk500hd1829_remove, }; module_mipi_dsi_driver(ltk500hd1829_driver); diff --git a/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c b/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c index 989b030ea22d..5077893dab7c 100644 --- a/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +++ b/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c @@ -205,15 +205,7 @@ static int sharp_nt_panel_add(struct sharp_nt_panel *sharp_nt) if (ret) return ret; - drm_panel_add(&sharp_nt->base); - - return 0; -} - -static void sharp_nt_panel_del(struct sharp_nt_panel *sharp_nt) -{ - if (sharp_nt->base.dev) - drm_panel_remove(&sharp_nt->base); + return devm_drm_panel_add(dev, &sharp_nt->base); } static int sharp_nt_panel_probe(struct mipi_dsi_device *dsi) @@ -244,25 +236,7 @@ static int sharp_nt_panel_probe(struct mipi_dsi_device *dsi) if (ret < 0) return ret; - ret = mipi_dsi_attach(dsi); - if (ret < 0) { - sharp_nt_panel_del(sharp_nt); - return ret; - } - - return 0; -} - -static void sharp_nt_panel_remove(struct mipi_dsi_device *dsi) -{ - struct sharp_nt_panel *sharp_nt = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret); - - sharp_nt_panel_del(sharp_nt); + return devm_mipi_dsi_attach(&dsi->dev, dsi); } static const struct of_device_id sharp_nt_of_match[] = { @@ -277,7 +251,6 @@ static struct mipi_dsi_driver sharp_nt_panel_driver = { .of_match_table = sharp_nt_of_match, }, .probe = sharp_nt_panel_probe, - .remove = sharp_nt_panel_remove, }; module_mipi_dsi_driver(sharp_nt_panel_driver); diff --git a/drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c b/drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c index 0456f3d705e7..e59d9d32b1e0 100644 --- a/drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c +++ b/drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c @@ -233,30 +233,19 @@ static int sharp_ls060_probe(struct mipi_dsi_device *dsi) if (ret) return dev_err_probe(dev, ret, "Failed to get backlight\n"); - drm_panel_add(&ctx->panel); + ret = devm_drm_panel_add(dev, &ctx->panel); + if (ret) + return ret; - ret = mipi_dsi_attach(dsi); + ret = devm_mipi_dsi_attach(dev, dsi); if (ret < 0) { dev_err(dev, "Failed to attach to DSI host: %d\n", ret); - drm_panel_remove(&ctx->panel); return ret; } return 0; } -static void sharp_ls060_remove(struct mipi_dsi_device *dsi) -{ - struct sharp_ls060 *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); - - drm_panel_remove(&ctx->panel); -} - static const struct of_device_id sharp_ls060t1sx01_of_match[] = { { .compatible = "sharp,ls060t1sx01" }, { /* sentinel */ } @@ -265,7 +254,6 @@ MODULE_DEVICE_TABLE(of, sharp_ls060t1sx01_of_match); static struct mipi_dsi_driver sharp_ls060_driver = { .probe = sharp_ls060_probe, - .remove = sharp_ls060_remove, .driver = { .name = "panel-sharp-ls060t1sx01", .of_match_table = sharp_ls060t1sx01_of_match, diff --git a/drivers/gpu/drm/panel/panel-sony-td4353-jdi.c b/drivers/gpu/drm/panel/panel-sony-td4353-jdi.c index a14c86c60d19..285f0d033efd 100644 --- a/drivers/gpu/drm/panel/panel-sony-td4353-jdi.c +++ b/drivers/gpu/drm/panel/panel-sony-td4353-jdi.c @@ -214,30 +214,19 @@ static int sony_td4353_jdi_probe(struct mipi_dsi_device *dsi) ctx->panel.prepare_prev_first = true; - drm_panel_add(&ctx->panel); + ret = devm_drm_panel_add(dev, &ctx->panel); + if (ret) + return ret; - ret = mipi_dsi_attach(dsi); + ret = devm_mipi_dsi_attach(dev, dsi); if (ret < 0) { dev_err(dev, "Failed to attach to DSI host: %d\n", ret); - drm_panel_remove(&ctx->panel); return ret; } return 0; } -static void sony_td4353_jdi_remove(struct mipi_dsi_device *dsi) -{ - struct sony_td4353_jdi *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); - - drm_panel_remove(&ctx->panel); -} - static const struct of_device_id sony_td4353_jdi_of_match[] = { { .compatible = "sony,td4353-jdi-tama", .data = (void *)TYPE_TAMA_60HZ }, { /* sentinel */ } @@ -246,7 +235,6 @@ MODULE_DEVICE_TABLE(of, sony_td4353_jdi_of_match); static struct mipi_dsi_driver sony_td4353_jdi_driver = { .probe = sony_td4353_jdi_probe, - .remove = sony_td4353_jdi_remove, .driver = { .name = "panel-sony-td4353-jdi", .of_match_table = sony_td4353_jdi_of_match, diff --git a/drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c b/drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c index 216a6ad8696e..0ebd9836364e 100644 --- a/drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c +++ b/drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c @@ -472,30 +472,19 @@ static int truly_nt35521_probe(struct mipi_dsi_device *dsi) return dev_err_probe(dev, PTR_ERR(ctx->panel.backlight), "Failed to create backlight\n"); - drm_panel_add(&ctx->panel); + ret = devm_drm_panel_add(dev, &ctx->panel); + if (ret) + return ret; - ret = mipi_dsi_attach(dsi); + ret = devm_mipi_dsi_attach(dev, dsi); if (ret < 0) { dev_err(dev, "Failed to attach to DSI host: %d\n", ret); - drm_panel_remove(&ctx->panel); return ret; } return 0; } -static void truly_nt35521_remove(struct mipi_dsi_device *dsi) -{ - struct truly_nt35521 *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret); - - drm_panel_remove(&ctx->panel); -} - static const struct of_device_id truly_nt35521_of_match[] = { { .compatible = "sony,tulip-truly-nt35521" }, { /* sentinel */ } @@ -504,7 +493,6 @@ MODULE_DEVICE_TABLE(of, truly_nt35521_of_match); static struct mipi_dsi_driver truly_nt35521_driver = { .probe = truly_nt35521_probe, - .remove = truly_nt35521_remove, .driver = { .name = "panel-truly-nt35521", .of_match_table = truly_nt35521_of_match, diff --git a/drivers/gpu/drm/panel/panel-visionox-r66451.c b/drivers/gpu/drm/panel/panel-visionox-r66451.c index 690cccedd438..1efb139bb711 100644 --- a/drivers/gpu/drm/panel/panel-visionox-r66451.c +++ b/drivers/gpu/drm/panel/panel-visionox-r66451.c @@ -304,29 +304,17 @@ static int visionox_r66451_probe(struct mipi_dsi_device *dsi) return dev_err_probe(dev, PTR_ERR(ctx->panel.backlight), "Failed to create backlight\n"); - drm_panel_add(&ctx->panel); + ret = devm_drm_panel_add(dev, &ctx->panel); + if (ret) + return ret; - ret = mipi_dsi_attach(dsi); - if (ret < 0) { + ret = devm_mipi_dsi_attach(dev, dsi); + if (ret < 0) dev_err(dev, "Failed to attach to DSI host: %d\n", ret); - drm_panel_remove(&ctx->panel); - } return ret; } -static void visionox_r66451_remove(struct mipi_dsi_device *dsi) -{ - struct visionox_r66451 *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - dev_err(&dsi->dev, "Failed to detach DSI host: %d\n", ret); - - drm_panel_remove(&ctx->panel); -} - static const struct of_device_id visionox_r66451_of_match[] = { {.compatible = "visionox,r66451"}, { /*sentinel*/ } @@ -335,7 +323,6 @@ MODULE_DEVICE_TABLE(of, visionox_r66451_of_match); static struct mipi_dsi_driver visionox_r66451_driver = { .probe = visionox_r66451_probe, - .remove = visionox_r66451_remove, .driver = { .name = "panel-visionox-r66451", .of_match_table = visionox_r66451_of_match, diff --git a/drivers/gpu/drm/panel/panel-visionox-rm69299.c b/drivers/gpu/drm/panel/panel-visionox-rm69299.c index 50f8a84537ca..4309e04c35c4 100644 --- a/drivers/gpu/drm/panel/panel-visionox-rm69299.c +++ b/drivers/gpu/drm/panel/panel-visionox-rm69299.c @@ -382,31 +382,21 @@ static int visionox_rm69299_probe(struct mipi_dsi_device *dsi) return dev_err_probe(dev, PTR_ERR(ctx->panel.backlight), "Failed to create backlight\n"); - drm_panel_add(&ctx->panel); + ret = devm_drm_panel_add(dev, &ctx->panel); + if (ret) + return ret; dsi->lanes = 4; dsi->format = MIPI_DSI_FMT_RGB888; dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_LPM | MIPI_DSI_CLOCK_NON_CONTINUOUS; - ret = mipi_dsi_attach(dsi); + ret = devm_mipi_dsi_attach(dev, dsi); if (ret < 0) { dev_err(dev, "dsi attach failed ret = %d\n", ret); - goto err_dsi_attach; + return ret; } return 0; - -err_dsi_attach: - drm_panel_remove(&ctx->panel); - return ret; -} - -static void visionox_rm69299_remove(struct mipi_dsi_device *dsi) -{ - struct visionox_rm69299 *ctx = mipi_dsi_get_drvdata(dsi); - - mipi_dsi_detach(ctx->dsi); - drm_panel_remove(&ctx->panel); } const struct visionox_rm69299_panel_desc visionox_rm69299_1080p_display_desc = { @@ -438,7 +428,6 @@ static struct mipi_dsi_driver visionox_rm69299_driver = { .of_match_table = visionox_rm69299_of_match, }, .probe = visionox_rm69299_probe, - .remove = visionox_rm69299_remove, }; module_mipi_dsi_driver(visionox_rm69299_driver); -- 2.43.0