From e8dbe37ecc8b3f4a85a974723d1bada29a34bccd Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 13 Nov 2023 07:49:24 -0500 Subject: [PATCH] Drop fbdev-omapfb-drop-unused-remove-function.patch Signed-off-by: Sasha Levin --- ...v-omapfb-drop-unused-remove-function.patch | 54 ------------------- queue-4.14/series | 1 - ...v-omapfb-drop-unused-remove-function.patch | 54 ------------------- queue-4.19/series | 1 - ...v-omapfb-drop-unused-remove-function.patch | 54 ------------------- queue-5.10/series | 1 - ...v-omapfb-drop-unused-remove-function.patch | 54 ------------------- queue-5.15/series | 1 - ...v-omapfb-drop-unused-remove-function.patch | 54 ------------------- queue-5.4/series | 1 - ...v-omapfb-drop-unused-remove-function.patch | 54 ------------------- queue-6.1/series | 1 - ...v-omapfb-drop-unused-remove-function.patch | 54 ------------------- queue-6.5/series | 1 - ...v-omapfb-drop-unused-remove-function.patch | 54 ------------------- queue-6.6/series | 1 - 16 files changed, 440 deletions(-) delete mode 100644 queue-4.14/fbdev-omapfb-drop-unused-remove-function.patch delete mode 100644 queue-4.19/fbdev-omapfb-drop-unused-remove-function.patch delete mode 100644 queue-5.10/fbdev-omapfb-drop-unused-remove-function.patch delete mode 100644 queue-5.15/fbdev-omapfb-drop-unused-remove-function.patch delete mode 100644 queue-5.4/fbdev-omapfb-drop-unused-remove-function.patch delete mode 100644 queue-6.1/fbdev-omapfb-drop-unused-remove-function.patch delete mode 100644 queue-6.5/fbdev-omapfb-drop-unused-remove-function.patch delete mode 100644 queue-6.6/fbdev-omapfb-drop-unused-remove-function.patch 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 index 1d782c4c123..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - 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 "); - MODULE_DESCRIPTION("OMAP VRFB"); --- -2.42.0 - diff --git a/queue-4.14/series b/queue-4.14/series index 1ac9669d2d8..109ad0918ce 100644 --- 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 index 3d90422d12a..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - 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 "); - MODULE_DESCRIPTION("OMAP VRFB"); --- -2.42.0 - diff --git a/queue-4.19/series b/queue-4.19/series index 57672b7fb93..ce088f620bd 100644 --- 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 index 6a028362533..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - 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 "); - MODULE_DESCRIPTION("OMAP VRFB"); --- -2.42.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 2ab9b969350..f0cf4c042c7 100644 --- 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 index cc8a75d948a..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - 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 "); - MODULE_DESCRIPTION("OMAP VRFB"); --- -2.42.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 54eb6538d0c..09c6199db0f 100644 --- 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 index aa59ba7e101..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - 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 "); - MODULE_DESCRIPTION("OMAP VRFB"); --- -2.42.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 38b10a22445..1b2952c6929 100644 --- 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 index 0649853f596..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - 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 "); - MODULE_DESCRIPTION("OMAP VRFB"); --- -2.42.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 2228aafcf1a..33173ec0a03 100644 --- 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 index 4c106673ed1..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - 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 "); - MODULE_DESCRIPTION("OMAP VRFB"); --- -2.42.0 - diff --git a/queue-6.5/series b/queue-6.5/series index 7d2bc9fa2c4..b050a2945c0 100644 --- 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 index ffbac1e919f..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Helge Deller -Signed-off-by: Sasha Levin ---- - 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 "); - MODULE_DESCRIPTION("OMAP VRFB"); --- -2.42.0 - diff --git a/queue-6.6/series b/queue-6.6/series index e7913dbf99d..a88a6a49701 100644 --- 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 -- 2.47.3