diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-11-23 18:10:39 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-11-23 18:10:40 +0100 |
| commit | b26ca735195bd2ffd57539b4ac5565cd40a1fffd (patch) | |
| tree | 9e6c801ecac3d476b4f91a1aada165d3c291173a /drivers/gpu/drm/imx/lcdc | |
| parent | c79b972eb88b077d2765e7790d0902b3dc94d55c (diff) | |
| parent | 815d8b0425ad1164e45953ac3d56a9f6f63792cc (diff) | |
Merge tag 'drm-misc-next-2023-11-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 6.8:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- Drop deprecated drm_kms_helper.edid_firmware module parameter
Driver Changes:
- Convert platform drivers remove callback to return void
- imagination: Introduction of the Imagination GPU Support
- rockchip:
- rk3066_hdmi: Convert to atomic
- vop2: Support NV20 and NV30
- panel:
- elida-kd35t133: PM reworks
- New panels: Powkiddy RK2023
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/drzvrbsej2txf6a6npc4ukkpadj3wio7edkjbgsfdm4l33szpe@fgwtdy5z5ev7
Diffstat (limited to 'drivers/gpu/drm/imx/lcdc')
| -rw-r--r-- | drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c index 22b65f4a0e30..0902983374d0 100644 --- a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c +++ b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c @@ -515,14 +515,12 @@ static int imx_lcdc_probe(struct platform_device *pdev) return 0; } -static int imx_lcdc_remove(struct platform_device *pdev) +static void imx_lcdc_remove(struct platform_device *pdev) { struct drm_device *drm = platform_get_drvdata(pdev); drm_dev_unregister(drm); drm_atomic_helper_shutdown(drm); - - return 0; } static void imx_lcdc_shutdown(struct platform_device *pdev) @@ -536,7 +534,7 @@ static struct platform_driver imx_lcdc_driver = { .of_match_table = imx_lcdc_of_dev_id, }, .probe = imx_lcdc_probe, - .remove = imx_lcdc_remove, + .remove_new = imx_lcdc_remove, .shutdown = imx_lcdc_shutdown, }; module_platform_driver(imx_lcdc_driver); |