diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-08-15 12:07:03 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-08-15 12:07:19 +1000 |
| commit | e1f9c849b59eae6ccd95a400cd5c9b726f81ca52 (patch) | |
| tree | 4b83e0455f4b28ab78991d6bbd9bb56fb6104052 /drivers/gpu/drm/mediatek/mtk_cec.c | |
| parent | 57bca71dce1626092b6a2bc91225058af250a93f (diff) | |
| parent | fb7e600df0a006f3661eddb424cd92bae26df350 (diff) | |
| download | linux-e1f9c849b59eae6ccd95a400cd5c9b726f81ca52.tar.gz linux-e1f9c849b59eae6ccd95a400cd5c9b726f81ca52.tar.bz2 linux-e1f9c849b59eae6ccd95a400cd5c9b726f81ca52.zip | |
Merge tag 'mediatek-drm-next-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next
Mediatek DRM Next for Linux 6.6
1. Small mtk-dpi cleanups
2. DisplayPort: support eDP and aux-bus
3. Fix uninitialized symbol
4. Do not check for 0 return after calling platform_get_irq()
5. Convert to platform remove callback returning void
6. Fix coverity issues
7. Fix potential memory leak if vmap() fail
8. Fix void-pointer-to-enum-cast warning
9. Rid W=1 warnings from GPU
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230813152726.14802-1-chunkuang.hu@kernel.org
Diffstat (limited to 'drivers/gpu/drm/mediatek/mtk_cec.c')
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_cec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_cec.c b/drivers/gpu/drm/mediatek/mtk_cec.c index b640bc0559e7..f47f417d8ba6 100644 --- a/drivers/gpu/drm/mediatek/mtk_cec.c +++ b/drivers/gpu/drm/mediatek/mtk_cec.c @@ -235,13 +235,12 @@ static int mtk_cec_probe(struct platform_device *pdev) return 0; } -static int mtk_cec_remove(struct platform_device *pdev) +static void mtk_cec_remove(struct platform_device *pdev) { struct mtk_cec *cec = platform_get_drvdata(pdev); mtk_cec_htplg_irq_disable(cec); clk_disable_unprepare(cec->clk); - return 0; } static const struct of_device_id mtk_cec_of_ids[] = { @@ -252,7 +251,7 @@ MODULE_DEVICE_TABLE(of, mtk_cec_of_ids); struct platform_driver mtk_cec_driver = { .probe = mtk_cec_probe, - .remove = mtk_cec_remove, + .remove_new = mtk_cec_remove, .driver = { .name = "mediatek-cec", .of_match_table = mtk_cec_of_ids, |