drop some hsi patches from 4.19

diff --git a/queue-4.19/hsi-omap_ssi_core-convert-to-platform-remove-callbac.patch b/queue-4.19/hsi-omap_ssi_core-convert-to-platform-remove-callbac.patch
deleted file mode 100644 (file)
index a112bce..0000000
--- a/queue-4.19/hsi-omap_ssi_core-convert-to-platform-remove-callbac.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0f7521231349911108210eccd3d6360be044a980 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Apr 2024 15:41:10 +0200
-Subject: HSI: omap_ssi_core: Convert to platform remove callback returning
- void
-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 94eabddc24b3ec2d9e0ff77e17722a2afb092155 ]
-
-The .remove() callback for a platform driver returns an int which makes
-many driver authors wrongly assume it's possible to do error handling by
-returning an error code. However the value returned is ignored (apart
-from emitting a warning) and this typically results in resource leaks.
-
-To improve here there is a quest to make the remove callback return
-void. In the first step of this quest all drivers are converted to
-.remove_new(), which already returns void. Eventually after all drivers
-are converted, .remove_new() will be renamed to .remove().
-
-Trivially convert this driver from always returning zero in the remove
-callback to the void returning variant.
-
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Link: https://lore.kernel.org/r/bc6b1caafa977346b33c1040d0f8e616bc0457bf.1712756364.git.u.kleine-koenig@pengutronix.de
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hsi/controllers/omap_ssi_core.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c
-index 6595f34e51aad..366117e51f418 100644
---- a/drivers/hsi/controllers/omap_ssi_core.c
-+++ b/drivers/hsi/controllers/omap_ssi_core.c
-@@ -581,7 +581,7 @@ static int ssi_probe(struct platform_device *pd)
-       return err;
- }
- 
--static int ssi_remove(struct platform_device *pd)
-+static void ssi_remove(struct platform_device *pd)
- {
-       struct hsi_controller *ssi = platform_get_drvdata(pd);
- 
-@@ -595,8 +595,6 @@ static int ssi_remove(struct platform_device *pd)
-       platform_set_drvdata(pd, NULL);
- 
-       pm_runtime_disable(&pd->dev);
--
--      return 0;
- }
- 
- #ifdef CONFIG_PM
-@@ -652,7 +650,7 @@ MODULE_DEVICE_TABLE(of, omap_ssi_of_match);
- 
- static struct platform_driver ssi_pdriver = {
-       .probe = ssi_probe,
--      .remove = ssi_remove,
-+      .remove_new = ssi_remove,
-       .driver = {
-               .name   = "omap_ssi",
-               .pm     = DEV_PM_OPS,
--- 
-2.43.0
-

diff --git a/queue-4.19/hsi-omap_ssi_port-convert-to-platform-remove-callbac.patch b/queue-4.19/hsi-omap_ssi_port-convert-to-platform-remove-callbac.patch
deleted file mode 100644 (file)
index f0aa079..0000000
--- a/queue-4.19/hsi-omap_ssi_port-convert-to-platform-remove-callbac.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c479dbc2c44d3dabeec1eb829e48813c6d0d3fc5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Apr 2024 15:41:11 +0200
-Subject: HSI: omap_ssi_port: Convert to platform remove callback returning
- void
-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 c076486b6a28aa584b3e86312442bac09279a015 ]
-
-The .remove() callback for a platform driver returns an int which makes
-many driver authors wrongly assume it's possible to do error handling by
-returning an error code. However the value returned is ignored (apart
-from emitting a warning) and this typically results in resource leaks.
-
-To improve here there is a quest to make the remove callback return
-void. In the first step of this quest all drivers are converted to
-.remove_new(), which already returns void. Eventually after all drivers
-are converted, .remove_new() will be renamed to .remove().
-
-Trivially convert this driver from always returning zero in the remove
-callback to the void returning variant.
-
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Link: https://lore.kernel.org/r/11e06f4cce041436bd63fb24361f3cee06bd2d59.1712756364.git.u.kleine-koenig@pengutronix.de
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hsi/controllers/omap_ssi_port.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c
-index e6149fd43b628..2de7e54ddcca0 100644
---- a/drivers/hsi/controllers/omap_ssi_port.c
-+++ b/drivers/hsi/controllers/omap_ssi_port.c
-@@ -1259,7 +1259,7 @@ static int ssi_port_probe(struct platform_device *pd)
-       return err;
- }
- 
--static int ssi_port_remove(struct platform_device *pd)
-+static void ssi_port_remove(struct platform_device *pd)
- {
-       struct hsi_port *port = platform_get_drvdata(pd);
-       struct omap_ssi_port *omap_port = hsi_port_drvdata(port);
-@@ -1286,8 +1286,6 @@ static int ssi_port_remove(struct platform_device *pd)
- 
-       pm_runtime_dont_use_autosuspend(&pd->dev);
-       pm_runtime_disable(&pd->dev);
--
--      return 0;
- }
- 
- static int ssi_restore_divisor(struct omap_ssi_port *omap_port)
-@@ -1422,7 +1420,7 @@ MODULE_DEVICE_TABLE(of, omap_ssi_port_of_match);
- 
- struct platform_driver ssi_port_pdriver = {
-       .probe = ssi_port_probe,
--      .remove = ssi_port_remove,
-+      .remove_new = ssi_port_remove,
-       .driver = {
-               .name   = "omap_ssi_port",
-               .of_match_table = omap_ssi_port_of_match,
--- 
-2.43.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 3c75a824e153007640f189822fe36df8524de164..81f3f90c834348089616ea5b5ed9055e822b359c 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -23,8 +23,6 @@ jffs2-prevent-xattr-node-from-overflowing-the-eraseb.patch
 null_blk-fix-missing-mutex_destroy-at-module-removal.patch
 md-fix-resync-softlockup-when-bitmap-size-is-less-th.patch
 power-supply-cros_usbpd-provide-id-table-for-avoidin.patch
-hsi-omap_ssi_core-convert-to-platform-remove-callbac.patch
-hsi-omap_ssi_port-convert-to-platform-remove-callbac.patch
 nfsd-drop-st_mutex-before-calling-move_to_close_lru.patch
 wifi-ath10k-poll-service-ready-message-before-failin.patch
 x86-boot-ignore-relocations-in-.notes-sections-in-wa.patch