linux (Rockchip): rebase patches for 6.11-rc1

This commit is contained in:
Rudi Heitbaum 2024-07-30 13:11:57 +00:00
parent 33b0203020
commit 9eb8e5d922

View File

@ -465,7 +465,7 @@ new file mode 100644
index 000000000000..f4b9320733be index 000000000000..f4b9320733be
--- /dev/null --- /dev/null
+++ b/drivers/media/platform/rockchip/iep/iep.c +++ b/drivers/media/platform/rockchip/iep/iep.c
@@ -0,0 +1,1089 @@ @@ -0,0 +1,1087 @@
+// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: GPL-2.0-only
+/* +/*
+ * Rockchip Image Enhancement Processor (IEP) driver + * Rockchip Image Enhancement Processor (IEP) driver
@ -1474,7 +1474,7 @@ index 000000000000..f4b9320733be
+return ret; +return ret;
+} +}
+ +
+static int iep_remove(struct platform_device *pdev) +static void iep_remove(struct platform_device *pdev)
+{ +{
+ struct rockchip_iep *iep = platform_get_drvdata(pdev); + struct rockchip_iep *iep = platform_get_drvdata(pdev);
+ +
@ -1484,8 +1484,6 @@ index 000000000000..f4b9320733be
+ v4l2_m2m_release(iep->m2m_dev); + v4l2_m2m_release(iep->m2m_dev);
+ video_unregister_device(&iep->vfd); + video_unregister_device(&iep->vfd);
+ v4l2_device_unregister(&iep->v4l2_dev); + v4l2_device_unregister(&iep->v4l2_dev);
+
+ return 0;
+} +}
+ +
+static int __maybe_unused iep_runtime_suspend(struct device *dev) +static int __maybe_unused iep_runtime_suspend(struct device *dev)