diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-06-02 13:38:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-06-02 13:39:00 +1000 |
| commit | 2e1492835e439fceba57a5b0f9b17da8e78ffa3d (patch) | |
| tree | d3376b545f0a123fb76941141d667e4914593ffa /drivers/gpu/drm/panel/panel-edp.c | |
| parent | 85d712f033d23bb56a373e29465470c036532d46 (diff) | |
| parent | 43049f17b5262826ef64a19762a096782398ef8f (diff) | |
Merge tag 'drm-misc-next-2023-06-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.5:
UAPI Changes:
Cross-subsystem Changes:
* fbdev:
* Add Kconfig options and initializer macros for file I/O, convert
DRM fbdev emulation
Core Changes:
* Unify handling of struct file_operations.show_fdinfo
* Use .probe in all i2c code (interface cleanup)
* TTM:
* Remove unused code
Driver Changes:
* amdgpu:
* Use shared show_fdinfo code
* Fix building without procfs
* bridge:
* display-conenctor: Add support for external power supply
* samsung-dsim: Fix enabling; Support variable clocking
* tc358767: Fixes
* ti-sn65dsi83: Fix enabling
* msm:
* Use shared show_fdinfo code
* msxfb:
* Add support for i.MX93 LCDIF
* panel:
* Add support for Ampire AM-800480L1TMQW-T00H plus DT bindings
* panel-edp: Convert .remove to return void
* stm:
* dsi: Use devm_ helper
* ltdc: Fix potential invalid pointer deref
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230601112246.GA10882@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/panel/panel-edp.c')
| -rw-r--r-- | drivers/gpu/drm/panel/panel-edp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index e23ddab2126e..fbd114b4f0be 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -903,7 +903,7 @@ err_finished_ddc_init: return err; } -static int panel_edp_remove(struct device *dev) +static void panel_edp_remove(struct device *dev) { struct panel_edp *panel = dev_get_drvdata(dev); @@ -918,8 +918,6 @@ static int panel_edp_remove(struct device *dev) kfree(panel->edid); panel->edid = NULL; - - return 0; } static void panel_edp_shutdown(struct device *dev) @@ -1934,9 +1932,9 @@ static int panel_edp_platform_probe(struct platform_device *pdev) return panel_edp_probe(&pdev->dev, id->data, NULL); } -static int panel_edp_platform_remove(struct platform_device *pdev) +static void panel_edp_platform_remove(struct platform_device *pdev) { - return panel_edp_remove(&pdev->dev); + panel_edp_remove(&pdev->dev); } static void panel_edp_platform_shutdown(struct platform_device *pdev) @@ -1957,7 +1955,7 @@ static struct platform_driver panel_edp_platform_driver = { .pm = &panel_edp_pm_ops, }, .probe = panel_edp_platform_probe, - .remove = panel_edp_platform_remove, + .remove_new = panel_edp_platform_remove, .shutdown = panel_edp_platform_shutdown, }; |