fix up irqdomain patch in 6.1 and 5.15

diff --git a/queue-5.15/irqdomain-fixed-unbalanced-fwnode-get-and-put.patch b/queue-5.15/irqdomain-fixed-unbalanced-fwnode-get-and-put.patch
index ebb4d7c01198fcf5f71a356af9ff1b10e78f2070..a0f56535ab077f0d28e070f1dc1d0e4d998cd986 100644 (file)
--- a/queue-5.15/irqdomain-fixed-unbalanced-fwnode-get-and-put.patch
+++ b/queue-5.15/irqdomain-fixed-unbalanced-fwnode-get-and-put.patch
@@ -1,4 +1,4 @@
-From e63bdbbdc2f445f70035b6d188456819a5e70cf1 Mon Sep 17 00:00:00 2001
+From 86149a873868c55caf9575063b939c46b3ebea0f Mon Sep 17 00:00:00 2001
 From: Sasha Levin <sashal@kernel.org>
 Date: Fri, 14 Jun 2024 19:32:04 +0200
 Subject: irqdomain: Fixed unbalanced fwnode get and put
@@ -23,14 +23,12 @@ Cc: stable@vger.kernel.org
 Link: https://lore.kernel.org/r/20240614173232.1184015-4-herve.codina@bootlin.com
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- kernel/irq/irqdomain.c | 7 ++-----
+ kernel/irq/irqdomain.c |    7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
-diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
-index 966ee3a79ce9c..b533b5b166444 100644
 --- a/kernel/irq/irqdomain.c
 +++ b/kernel/irq/irqdomain.c
-@@ -153,7 +153,6 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
+@@ -153,7 +153,6 @@ static struct irq_domain *__irq_domain_c
                switch (fwid->type) {
                case IRQCHIP_FWNODE_NAMED:
                case IRQCHIP_FWNODE_NAMED_ID:
@@ -38,7 +36,7 @@ index 966ee3a79ce9c..b533b5b166444 100644
                        domain->name = kstrdup(fwid->name, GFP_KERNEL);
                        if (!domain->name) {
                                kfree(domain);
-@@ -162,7 +161,6 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
+@@ -162,7 +161,6 @@ static struct irq_domain *__irq_domain_c
                        domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
                        break;
                default:
@@ -46,15 +44,15 @@ index 966ee3a79ce9c..b533b5b166444 100644
                        domain->name = fwid->name;
                        break;
                }
-@@ -182,7 +180,6 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
-               }
+@@ -184,7 +182,6 @@ static struct irq_domain *__irq_domain_c
+               strreplace(name, '/', ':');
  
-               domain->name = strreplace(name, '/', ':');
+               domain->name = name;
 -              domain->fwnode = fwnode;
                domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
        }
  
-@@ -198,8 +195,8 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
+@@ -200,8 +197,8 @@ static struct irq_domain *__irq_domain_c
                domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
        }
  
@@ -65,6 +63,3 @@ index 966ee3a79ce9c..b533b5b166444 100644
  
        /* Fill structure */
        INIT_RADIX_TREE(&domain->revmap_tree, GFP_KERNEL);
--- 
-2.43.0
-

diff --git a/queue-5.15/irqdomain-use-return-value-of-strreplace.patch b/queue-5.15/irqdomain-use-return-value-of-strreplace.patch
deleted file mode 100644 (file)
index 7c8af86..0000000
--- a/queue-5.15/irqdomain-use-return-value-of-strreplace.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bae7226ab8ad5c0968380581b021e4ddf7cbe622 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 28 Jun 2023 18:02:51 +0300
-Subject: irqdomain: Use return value of strreplace()
-
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-[ Upstream commit 67a4e1a3bf7c68ed3fbefc4213648165d912cabb ]
-
-Since strreplace() returns the pointer to the string itself, use it
-directly.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Link: https://lore.kernel.org/r/20230628150251.17832-1-andriy.shevchenko@linux.intel.com
-Stable-dep-of: 6ce3e98184b6 ("irqdomain: Fixed unbalanced fwnode get and put")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/irq/irqdomain.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
-index e0b67784ac1e0..966ee3a79ce9c 100644
---- a/kernel/irq/irqdomain.c
-+++ b/kernel/irq/irqdomain.c
-@@ -181,9 +181,7 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
-                       return NULL;
-               }
- 
--              strreplace(name, '/', ':');
--
--              domain->name = name;
-+              domain->name = strreplace(name, '/', ':');
-               domain->fwnode = fwnode;
-               domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
-       }
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 56fafd4f56543ea06875973f02c299e06b40544e..74aeafff37375d1da41c445715db90a14f7631cf 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -334,7 +334,6 @@ leds-triggers-flush-pending-brightness-before-activa.patch
 f2fs-introduce-f2fs_ipu_honor_opu_write-ipu-policy.patch
 f2fs-fix-to-avoid-use-ssr-allocate-when-do-defragmen.patch
 f2fs-assign-curseg_all_data_atgc-if-blkaddr-is-valid.patch
-irqdomain-use-return-value-of-strreplace.patch
 irqdomain-fixed-unbalanced-fwnode-get-and-put.patch
 genirq-allow-the-pm-device-to-originate-from-irq-dom.patch
 irqchip-imx-irqsteer-constify-irq_chip-struct.patch

diff --git a/queue-6.1/irqdomain-fixed-unbalanced-fwnode-get-and-put.patch b/queue-6.1/irqdomain-fixed-unbalanced-fwnode-get-and-put.patch
index 0faceee08bc6b1eb147763b4244e23da3e6caa15..20f36e8918558a514a1450c71c65d4ea5e6b90b3 100644 (file)
--- a/queue-6.1/irqdomain-fixed-unbalanced-fwnode-get-and-put.patch
+++ b/queue-6.1/irqdomain-fixed-unbalanced-fwnode-get-and-put.patch
@@ -23,14 +23,12 @@ Cc: stable@vger.kernel.org
 Link: https://lore.kernel.org/r/20240614173232.1184015-4-herve.codina@bootlin.com
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- kernel/irq/irqdomain.c | 7 ++-----
+ kernel/irq/irqdomain.c |    7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
-diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
-index e03baca901e76..b1ed088b23640 100644
 --- a/kernel/irq/irqdomain.c
 +++ b/kernel/irq/irqdomain.c
-@@ -154,7 +154,6 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
+@@ -154,7 +154,6 @@ static struct irq_domain *__irq_domain_c
                switch (fwid->type) {
                case IRQCHIP_FWNODE_NAMED:
                case IRQCHIP_FWNODE_NAMED_ID:
@@ -38,7 +36,7 @@ index e03baca901e76..b1ed088b23640 100644
                        domain->name = kstrdup(fwid->name, GFP_KERNEL);
                        if (!domain->name) {
                                kfree(domain);
-@@ -163,7 +162,6 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
+@@ -163,7 +162,6 @@ static struct irq_domain *__irq_domain_c
                        domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
                        break;
                default:
@@ -46,15 +44,15 @@ index e03baca901e76..b1ed088b23640 100644
                        domain->name = fwid->name;
                        break;
                }
-@@ -183,7 +181,6 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
-               }
+@@ -185,7 +183,6 @@ static struct irq_domain *__irq_domain_c
+               strreplace(name, '/', ':');
  
-               domain->name = strreplace(name, '/', ':');
+               domain->name = name;
 -              domain->fwnode = fwnode;
                domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
        }
  
-@@ -199,8 +196,8 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
+@@ -201,8 +198,8 @@ static struct irq_domain *__irq_domain_c
                domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
        }
  
@@ -65,6 +63,3 @@ index e03baca901e76..b1ed088b23640 100644
  
        /* Fill structure */
        INIT_RADIX_TREE(&domain->revmap_tree, GFP_KERNEL);
--- 
-2.43.0
-

diff --git a/queue-6.1/irqdomain-use-return-value-of-strreplace.patch b/queue-6.1/irqdomain-use-return-value-of-strreplace.patch
deleted file mode 100644 (file)
index 2aea896..0000000
--- a/queue-6.1/irqdomain-use-return-value-of-strreplace.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 75d4494abda65fead10f8060be8a200a8960a25f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 28 Jun 2023 18:02:51 +0300
-Subject: irqdomain: Use return value of strreplace()
-
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-[ Upstream commit 67a4e1a3bf7c68ed3fbefc4213648165d912cabb ]
-
-Since strreplace() returns the pointer to the string itself, use it
-directly.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Link: https://lore.kernel.org/r/20230628150251.17832-1-andriy.shevchenko@linux.intel.com
-Stable-dep-of: 6ce3e98184b6 ("irqdomain: Fixed unbalanced fwnode get and put")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/irq/irqdomain.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
-index 607c0c3d3f5e1..e03baca901e76 100644
---- a/kernel/irq/irqdomain.c
-+++ b/kernel/irq/irqdomain.c
-@@ -182,9 +182,7 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
-                       return NULL;
-               }
- 
--              strreplace(name, '/', ':');
--
--              domain->name = name;
-+              domain->name = strreplace(name, '/', ':');
-               domain->fwnode = fwnode;
-               domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
-       }
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index b98ed62a2766821e2928487458260895508b56cd..8daacfe4b92aa27db842d66b6aab3cc58eba176d 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -22,7 +22,6 @@ mm-page_alloc-control-latency-caused-by-zone-pcp-dra.patch
 mm-page_alloc-fix-pcp-count-race-between-drain_pages.patch
 f2fs-fix-to-avoid-use-ssr-allocate-when-do-defragmen.patch
 f2fs-assign-curseg_all_data_atgc-if-blkaddr-is-valid.patch
-irqdomain-use-return-value-of-strreplace.patch
 irqdomain-fixed-unbalanced-fwnode-get-and-put.patch
 drm-udl-rename-struct-udl_drm_connector-to-struct-ud.patch
 drm-udl-test-pixel-limit-in-mode-config-s-mode-valid.patch