Drop fbdev-omapfb-drop-unused-remove-function.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/fbdev-omapfb-drop-unused-remove-function.patch b/queue-4.14/fbdev-omapfb-drop-unused-remove-function.patch
deleted file mode 100644 (file)
index 1d782c4..0000000
--- a/queue-4.14/fbdev-omapfb-drop-unused-remove-function.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3b7c977db2640cfc210b274253f850267a5f920c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 3 Nov 2023 18:35:58 +0100
-Subject: fbdev: omapfb: Drop unused remove function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-[ Upstream commit fc6699d62f5f4facc3e934efd25892fc36050b70 ]
-
-OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a
-module. With that __exit_p(vrfb_remove) always evaluates to NULL and
-vrfb_remove() is unused.
-
-If the driver was compilable as a module, it would fail to build because
-the type of vrfb_remove() isn't compatible with struct
-platform_driver::remove(). (The former returns void, the latter int.)
-
-Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Helge Deller <deller@gmx.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-index f346b02eee1d8..91d626e140098 100644
---- a/drivers/video/fbdev/omap2/omapfb/vrfb.c
-+++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-@@ -382,17 +382,10 @@ static int __init vrfb_probe(struct platform_device *pdev)
-       return 0;
- }
- 
--static void __exit vrfb_remove(struct platform_device *pdev)
--{
--      vrfb_loaded = false;
--}
--
- static struct platform_driver vrfb_driver = {
-       .driver.name    = "omapvrfb",
--      .remove         = __exit_p(vrfb_remove),
- };
--
--module_platform_driver_probe(vrfb_driver, vrfb_probe);
-+builtin_platform_driver_probe(vrfb_driver, vrfb_probe);
- 
- MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
- MODULE_DESCRIPTION("OMAP VRFB");
--- 
-2.42.0
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 1ac9669d2d83f7484b19c1bb51c36a019a1bf609..109ad0918ce8afa0cccb132fd6ff435c18334682 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -40,5 +40,4 @@ dccp-call-security_inet_conn_request-after-setting-i.patch
 dccp-tcp-call-security_inet_conn_request-after-setti.patch
 tg3-power-down-device-only-on-system_power_off.patch
 netfilter-xt_recent-fix-increase-ipv6-literal-buffer.patch
-fbdev-omapfb-drop-unused-remove-function.patch
 fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch

diff --git a/queue-4.19/fbdev-omapfb-drop-unused-remove-function.patch b/queue-4.19/fbdev-omapfb-drop-unused-remove-function.patch
deleted file mode 100644 (file)
index 3d90422..0000000
--- a/queue-4.19/fbdev-omapfb-drop-unused-remove-function.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a041f4288f49063d64c945383d87808e34baa331 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 3 Nov 2023 18:35:58 +0100
-Subject: fbdev: omapfb: Drop unused remove function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-[ Upstream commit fc6699d62f5f4facc3e934efd25892fc36050b70 ]
-
-OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a
-module. With that __exit_p(vrfb_remove) always evaluates to NULL and
-vrfb_remove() is unused.
-
-If the driver was compilable as a module, it would fail to build because
-the type of vrfb_remove() isn't compatible with struct
-platform_driver::remove(). (The former returns void, the latter int.)
-
-Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Helge Deller <deller@gmx.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-index f355ecfac3b18..8f1c2d2e80fdd 100644
---- a/drivers/video/fbdev/omap2/omapfb/vrfb.c
-+++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-@@ -382,17 +382,10 @@ static int __init vrfb_probe(struct platform_device *pdev)
-       return 0;
- }
- 
--static void __exit vrfb_remove(struct platform_device *pdev)
--{
--      vrfb_loaded = false;
--}
--
- static struct platform_driver vrfb_driver = {
-       .driver.name    = "omapvrfb",
--      .remove         = __exit_p(vrfb_remove),
- };
--
--module_platform_driver_probe(vrfb_driver, vrfb_probe);
-+builtin_platform_driver_probe(vrfb_driver, vrfb_probe);
- 
- MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
- MODULE_DESCRIPTION("OMAP VRFB");
--- 
-2.42.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 57672b7fb937ceeb957b11328687154fa0dc98e3..ce088f620bddfd256afc7275d146e647eba754b4 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -81,7 +81,6 @@ net-smc-fix-dangling-sock-under-state-smc_appfinclos.patch
 tg3-power-down-device-only-on-system_power_off.patch
 r8169-respect-userspace-disabling-iff_multicast.patch
 netfilter-xt_recent-fix-increase-ipv6-literal-buffer.patch
-fbdev-omapfb-drop-unused-remove-function.patch
 fbdev-imsttfb-fix-error-path-of-imsttfb_probe.patch
 fbdev-imsttfb-fix-a-resource-leak-in-probe.patch
 fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch

diff --git a/queue-5.10/fbdev-omapfb-drop-unused-remove-function.patch b/queue-5.10/fbdev-omapfb-drop-unused-remove-function.patch
deleted file mode 100644 (file)
index 6a02836..0000000
--- a/queue-5.10/fbdev-omapfb-drop-unused-remove-function.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ce360ca006dbc0bf742a3c507c038315b350dcbe Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 3 Nov 2023 18:35:58 +0100
-Subject: fbdev: omapfb: Drop unused remove function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-[ Upstream commit fc6699d62f5f4facc3e934efd25892fc36050b70 ]
-
-OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a
-module. With that __exit_p(vrfb_remove) always evaluates to NULL and
-vrfb_remove() is unused.
-
-If the driver was compilable as a module, it would fail to build because
-the type of vrfb_remove() isn't compatible with struct
-platform_driver::remove(). (The former returns void, the latter int.)
-
-Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Helge Deller <deller@gmx.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-index ee0dd4c6a6466..568e6e1eca628 100644
---- a/drivers/video/fbdev/omap2/omapfb/vrfb.c
-+++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-@@ -368,17 +368,10 @@ static int __init vrfb_probe(struct platform_device *pdev)
-       return 0;
- }
- 
--static void __exit vrfb_remove(struct platform_device *pdev)
--{
--      vrfb_loaded = false;
--}
--
- static struct platform_driver vrfb_driver = {
-       .driver.name    = "omapvrfb",
--      .remove         = __exit_p(vrfb_remove),
- };
--
--module_platform_driver_probe(vrfb_driver, vrfb_probe);
-+builtin_platform_driver_probe(vrfb_driver, vrfb_probe);
- 
- MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
- MODULE_DESCRIPTION("OMAP VRFB");
--- 
-2.42.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 2ab9b9693504e4d45c0cd5d0b8f775247477ebe9..f0cf4c042c7293fdf91074b8b5dfad47ad6e1971 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -199,7 +199,6 @@ x86-share-definition-of-__is_canonical_address.patch
 x86-sev-es-allow-copy_from_kernel_nofault-in-earlier.patch
 drm-syncobj-fix-drm_syncobj_wait_flags_wait_availabl.patch
 spi-spi-zynq-qspi-add-spi-mem-to-driver-kconfig-depe.patch
-fbdev-omapfb-drop-unused-remove-function.patch
 fbdev-imsttfb-fix-error-path-of-imsttfb_probe.patch
 fbdev-imsttfb-fix-a-resource-leak-in-probe.patch
 fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch

diff --git a/queue-5.15/fbdev-omapfb-drop-unused-remove-function.patch b/queue-5.15/fbdev-omapfb-drop-unused-remove-function.patch
deleted file mode 100644 (file)
index cc8a75d..0000000
--- a/queue-5.15/fbdev-omapfb-drop-unused-remove-function.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1ed043c5b67c52ed8dadf61ef38c6710f0b15feb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 3 Nov 2023 18:35:58 +0100
-Subject: fbdev: omapfb: Drop unused remove function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-[ Upstream commit fc6699d62f5f4facc3e934efd25892fc36050b70 ]
-
-OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a
-module. With that __exit_p(vrfb_remove) always evaluates to NULL and
-vrfb_remove() is unused.
-
-If the driver was compilable as a module, it would fail to build because
-the type of vrfb_remove() isn't compatible with struct
-platform_driver::remove(). (The former returns void, the latter int.)
-
-Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Helge Deller <deller@gmx.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-index ee0dd4c6a6466..568e6e1eca628 100644
---- a/drivers/video/fbdev/omap2/omapfb/vrfb.c
-+++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-@@ -368,17 +368,10 @@ static int __init vrfb_probe(struct platform_device *pdev)
-       return 0;
- }
- 
--static void __exit vrfb_remove(struct platform_device *pdev)
--{
--      vrfb_loaded = false;
--}
--
- static struct platform_driver vrfb_driver = {
-       .driver.name    = "omapvrfb",
--      .remove         = __exit_p(vrfb_remove),
- };
--
--module_platform_driver_probe(vrfb_driver, vrfb_probe);
-+builtin_platform_driver_probe(vrfb_driver, vrfb_probe);
- 
- MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
- MODULE_DESCRIPTION("OMAP VRFB");
--- 
-2.42.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 54eb6538d0ced5e2da761ee7c0ea17a4f790aa2a..09c6199db0f0d647c56cba138572ecda371811b0 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -259,7 +259,6 @@ netfilter-nat-fix-ipv6-nat-redirect-with-mapped-and-.patch
 drm-syncobj-fix-drm_syncobj_wait_flags_wait_availabl.patch
 asoc-hdmi-codec-register-hpd-callback-on-component-p.patch
 spi-spi-zynq-qspi-add-spi-mem-to-driver-kconfig-depe.patch
-fbdev-omapfb-drop-unused-remove-function.patch
 fbdev-imsttfb-fix-error-path-of-imsttfb_probe.patch
 fbdev-imsttfb-fix-a-resource-leak-in-probe.patch
 fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch

diff --git a/queue-5.4/fbdev-omapfb-drop-unused-remove-function.patch b/queue-5.4/fbdev-omapfb-drop-unused-remove-function.patch
deleted file mode 100644 (file)
index aa59ba7..0000000
--- a/queue-5.4/fbdev-omapfb-drop-unused-remove-function.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 2a702d8ed8780d437585ce1956b044356d38035c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 3 Nov 2023 18:35:58 +0100
-Subject: fbdev: omapfb: Drop unused remove function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-[ Upstream commit fc6699d62f5f4facc3e934efd25892fc36050b70 ]
-
-OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a
-module. With that __exit_p(vrfb_remove) always evaluates to NULL and
-vrfb_remove() is unused.
-
-If the driver was compilable as a module, it would fail to build because
-the type of vrfb_remove() isn't compatible with struct
-platform_driver::remove(). (The former returns void, the latter int.)
-
-Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Helge Deller <deller@gmx.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-index 819e0bc35b2d2..f2fb89c78783f 100644
---- a/drivers/video/fbdev/omap2/omapfb/vrfb.c
-+++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-@@ -370,17 +370,10 @@ static int __init vrfb_probe(struct platform_device *pdev)
-       return 0;
- }
- 
--static void __exit vrfb_remove(struct platform_device *pdev)
--{
--      vrfb_loaded = false;
--}
--
- static struct platform_driver vrfb_driver = {
-       .driver.name    = "omapvrfb",
--      .remove         = __exit_p(vrfb_remove),
- };
--
--module_platform_driver_probe(vrfb_driver, vrfb_probe);
-+builtin_platform_driver_probe(vrfb_driver, vrfb_probe);
- 
- MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
- MODULE_DESCRIPTION("OMAP VRFB");
--- 
-2.42.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 38b10a224457f6be0b242b13cd3f652f6ae8b32b..1b2952c692974e48b97aa31c1a15e18302dfeefc 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -125,7 +125,6 @@ netfilter-nft_redir-use-struct-nf_nat_range2-through.patch
 netfilter-nat-fix-ipv6-nat-redirect-with-mapped-and-.patch
 drm-syncobj-fix-drm_syncobj_wait_flags_wait_availabl.patch
 spi-spi-zynq-qspi-add-spi-mem-to-driver-kconfig-depe.patch
-fbdev-omapfb-drop-unused-remove-function.patch
 fbdev-imsttfb-fix-error-path-of-imsttfb_probe.patch
 fbdev-imsttfb-fix-a-resource-leak-in-probe.patch
 fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch

diff --git a/queue-6.1/fbdev-omapfb-drop-unused-remove-function.patch b/queue-6.1/fbdev-omapfb-drop-unused-remove-function.patch
deleted file mode 100644 (file)
index 0649853..0000000
--- a/queue-6.1/fbdev-omapfb-drop-unused-remove-function.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e233fea50ece48d0c4639bbdcd95938697d4852b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 3 Nov 2023 18:35:58 +0100
-Subject: fbdev: omapfb: Drop unused remove function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-[ Upstream commit fc6699d62f5f4facc3e934efd25892fc36050b70 ]
-
-OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a
-module. With that __exit_p(vrfb_remove) always evaluates to NULL and
-vrfb_remove() is unused.
-
-If the driver was compilable as a module, it would fail to build because
-the type of vrfb_remove() isn't compatible with struct
-platform_driver::remove(). (The former returns void, the latter int.)
-
-Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Helge Deller <deller@gmx.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-index ee0dd4c6a6466..568e6e1eca628 100644
---- a/drivers/video/fbdev/omap2/omapfb/vrfb.c
-+++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-@@ -368,17 +368,10 @@ static int __init vrfb_probe(struct platform_device *pdev)
-       return 0;
- }
- 
--static void __exit vrfb_remove(struct platform_device *pdev)
--{
--      vrfb_loaded = false;
--}
--
- static struct platform_driver vrfb_driver = {
-       .driver.name    = "omapvrfb",
--      .remove         = __exit_p(vrfb_remove),
- };
--
--module_platform_driver_probe(vrfb_driver, vrfb_probe);
-+builtin_platform_driver_probe(vrfb_driver, vrfb_probe);
- 
- MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
- MODULE_DESCRIPTION("OMAP VRFB");
--- 
-2.42.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 2228aafcf1aa1b5521185ffe9d34bfd29783ca2e..33173ec0a031475aa4761d923debd377d2039671 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -370,7 +370,6 @@ asoc-mediatek-mt8186_mt6366_rt1019_rt5682s-trivial-f.patch
 asoc-hdmi-codec-register-hpd-callback-on-component-p.patch
 asoc-dapm-fix-clock-get-name.patch
 spi-spi-zynq-qspi-add-spi-mem-to-driver-kconfig-depe.patch
-fbdev-omapfb-drop-unused-remove-function.patch
 fbdev-imsttfb-fix-error-path-of-imsttfb_probe.patch
 fbdev-imsttfb-fix-a-resource-leak-in-probe.patch
 fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch

diff --git a/queue-6.5/fbdev-omapfb-drop-unused-remove-function.patch b/queue-6.5/fbdev-omapfb-drop-unused-remove-function.patch
deleted file mode 100644 (file)
index 4c10667..0000000
--- a/queue-6.5/fbdev-omapfb-drop-unused-remove-function.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cba6bc51930ce33101f147b47e56afaa8d320f7a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 3 Nov 2023 18:35:58 +0100
-Subject: fbdev: omapfb: Drop unused remove function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-[ Upstream commit fc6699d62f5f4facc3e934efd25892fc36050b70 ]
-
-OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a
-module. With that __exit_p(vrfb_remove) always evaluates to NULL and
-vrfb_remove() is unused.
-
-If the driver was compilable as a module, it would fail to build because
-the type of vrfb_remove() isn't compatible with struct
-platform_driver::remove(). (The former returns void, the latter int.)
-
-Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Helge Deller <deller@gmx.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-index ee0dd4c6a6466..568e6e1eca628 100644
---- a/drivers/video/fbdev/omap2/omapfb/vrfb.c
-+++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-@@ -368,17 +368,10 @@ static int __init vrfb_probe(struct platform_device *pdev)
-       return 0;
- }
- 
--static void __exit vrfb_remove(struct platform_device *pdev)
--{
--      vrfb_loaded = false;
--}
--
- static struct platform_driver vrfb_driver = {
-       .driver.name    = "omapvrfb",
--      .remove         = __exit_p(vrfb_remove),
- };
--
--module_platform_driver_probe(vrfb_driver, vrfb_probe);
-+builtin_platform_driver_probe(vrfb_driver, vrfb_probe);
- 
- MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
- MODULE_DESCRIPTION("OMAP VRFB");
--- 
-2.42.0
-

diff --git a/queue-6.5/series b/queue-6.5/series
index 7d2bc9fa2c4315d8b50d2ed92755e3ff12793a28..b050a2945c0d4bae8c3d8be876d72506a2422d54 100644 (file)
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -535,7 +535,6 @@ asoc-hdmi-codec-register-hpd-callback-on-component-p.patch
 asoc-dapm-fix-clock-get-name.patch
 spi-spi-zynq-qspi-add-spi-mem-to-driver-kconfig-depe.patch
 arm64-arm-arm_pmuv3-perf-don-t-truncate-64-bit-regis.patch
-fbdev-omapfb-drop-unused-remove-function.patch
 fbdev-imsttfb-fix-double-free-in-probe.patch
 fbdev-imsttfb-fix-a-resource-leak-in-probe.patch
 alsa-hda-realtek-add-support-dual-speaker-for-dell.patch

diff --git a/queue-6.6/fbdev-omapfb-drop-unused-remove-function.patch b/queue-6.6/fbdev-omapfb-drop-unused-remove-function.patch
deleted file mode 100644 (file)
index ffbac1e..0000000
--- a/queue-6.6/fbdev-omapfb-drop-unused-remove-function.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a772de6bea2f5a9b5dad8afe0d9145fd8ee62564 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 3 Nov 2023 18:35:58 +0100
-Subject: fbdev: omapfb: Drop unused remove function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-[ Upstream commit fc6699d62f5f4facc3e934efd25892fc36050b70 ]
-
-OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a
-module. With that __exit_p(vrfb_remove) always evaluates to NULL and
-vrfb_remove() is unused.
-
-If the driver was compilable as a module, it would fail to build because
-the type of vrfb_remove() isn't compatible with struct
-platform_driver::remove(). (The former returns void, the latter int.)
-
-Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Helge Deller <deller@gmx.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-index ee0dd4c6a6466..568e6e1eca628 100644
---- a/drivers/video/fbdev/omap2/omapfb/vrfb.c
-+++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c
-@@ -368,17 +368,10 @@ static int __init vrfb_probe(struct platform_device *pdev)
-       return 0;
- }
- 
--static void __exit vrfb_remove(struct platform_device *pdev)
--{
--      vrfb_loaded = false;
--}
--
- static struct platform_driver vrfb_driver = {
-       .driver.name    = "omapvrfb",
--      .remove         = __exit_p(vrfb_remove),
- };
--
--module_platform_driver_probe(vrfb_driver, vrfb_probe);
-+builtin_platform_driver_probe(vrfb_driver, vrfb_probe);
- 
- MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
- MODULE_DESCRIPTION("OMAP VRFB");
--- 
-2.42.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index e7913dbf99de8169323d9093b508f06b7fbcd6de..a88a6a49701a1f0d303bc1a9731d2be68fb5c0fe 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -587,7 +587,6 @@ asoc-hdmi-codec-register-hpd-callback-on-component-p.patch
 asoc-dapm-fix-clock-get-name.patch
 spi-spi-zynq-qspi-add-spi-mem-to-driver-kconfig-depe.patch
 arm64-arm-arm_pmuv3-perf-don-t-truncate-64-bit-regis.patch
-fbdev-omapfb-drop-unused-remove-function.patch
 fbdev-imsttfb-fix-double-free-in-probe.patch
 fbdev-imsttfb-fix-a-resource-leak-in-probe.patch
 alsa-hda-realtek-add-support-dual-speaker-for-dell.patch