drop ps2 patch from all queues

diff --git a/queue-5.10/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch b/queue-5.10/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
deleted file mode 100644 (file)
index 940f03f..0000000
--- a/queue-5.10/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 04b74af75e33f41540f955fee5e81446951b5bec Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 12 Sep 2024 11:30:13 +0800
-Subject: Input: ps2-gpio - use IRQF_NO_AUTOEN flag in request_irq()
-
-From: Jinjie Ruan <ruanjinjie@huawei.com>
-
-[ Upstream commit dcd18a3fb1228409dfc24373c5c6868a655810b0 ]
-
-disable_irq() after request_irq() still has a time gap in which
-interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
-disable IRQ auto-enable when request IRQ.
-
-Fixes: 9ee0a0558819 ("Input: PS/2 gpio bit banging driver for serio bus")
-Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
-Acked-by: Danilo Krummrich <dakr@kernel.org>
-Link: https://lore.kernel.org/r/20240912033013.2610949-1-ruanjinjie@huawei.com
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/input/serio/ps2-gpio.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
-index 8970b49ea09a2..b0238a8b5c210 100644
---- a/drivers/input/serio/ps2-gpio.c
-+++ b/drivers/input/serio/ps2-gpio.c
-@@ -374,16 +374,14 @@ static int ps2_gpio_probe(struct platform_device *pdev)
-       }
- 
-       error = devm_request_irq(dev, drvdata->irq, ps2_gpio_irq,
--                               IRQF_NO_THREAD, DRIVER_NAME, drvdata);
-+                               IRQF_NO_THREAD | IRQF_NO_AUTOEN, DRIVER_NAME,
-+                               drvdata);
-       if (error) {
-               dev_err(dev, "failed to request irq %d: %d\n",
-                       drvdata->irq, error);
-               goto err_free_serio;
-       }
- 
--      /* Keep irq disabled until serio->open is called. */
--      disable_irq(drvdata->irq);
--
-       serio->id.type = SERIO_8042;
-       serio->open = ps2_gpio_open;
-       serio->close = ps2_gpio_close;
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 1d0424cebbfe927f5f3191e613880dff0b1133ee..cd5b2edda5df7d2bb79cf9a77b82a4f878ce7c94 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -189,7 +189,6 @@ rdma-hns-refactor-root-bt-allocation-for-mtr.patch
 rdma-hns-fix-the-overflow-risk-of-hem_list_calc_ba_r.patch
 rdma-hns-fix-spin_unlock_irqrestore-called-with-irqs.patch
 rdma-hns-optimize-hem-allocation-performance.patch
-input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
 riscv-fix-fp-alignment-bug-in-perf_callchain_user.patch
 rdma-cxgb4-added-null-check-for-lookup_atid.patch
 ntb-intel-fix-the-null-vs-is_err-bug-for-debugfs_cre.patch

diff --git a/queue-5.15/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch b/queue-5.15/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
deleted file mode 100644 (file)
index 65aad7c..0000000
--- a/queue-5.15/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2d007ddec282076923c4d84d6b12858b9f44594a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 12 Sep 2024 11:30:13 +0800
-Subject: Input: ps2-gpio - use IRQF_NO_AUTOEN flag in request_irq()
-
-From: Jinjie Ruan <ruanjinjie@huawei.com>
-
-[ Upstream commit dcd18a3fb1228409dfc24373c5c6868a655810b0 ]
-
-disable_irq() after request_irq() still has a time gap in which
-interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
-disable IRQ auto-enable when request IRQ.
-
-Fixes: 9ee0a0558819 ("Input: PS/2 gpio bit banging driver for serio bus")
-Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
-Acked-by: Danilo Krummrich <dakr@kernel.org>
-Link: https://lore.kernel.org/r/20240912033013.2610949-1-ruanjinjie@huawei.com
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/input/serio/ps2-gpio.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
-index 8970b49ea09a2..b0238a8b5c210 100644
---- a/drivers/input/serio/ps2-gpio.c
-+++ b/drivers/input/serio/ps2-gpio.c
-@@ -374,16 +374,14 @@ static int ps2_gpio_probe(struct platform_device *pdev)
-       }
- 
-       error = devm_request_irq(dev, drvdata->irq, ps2_gpio_irq,
--                               IRQF_NO_THREAD, DRIVER_NAME, drvdata);
-+                               IRQF_NO_THREAD | IRQF_NO_AUTOEN, DRIVER_NAME,
-+                               drvdata);
-       if (error) {
-               dev_err(dev, "failed to request irq %d: %d\n",
-                       drvdata->irq, error);
-               goto err_free_serio;
-       }
- 
--      /* Keep irq disabled until serio->open is called. */
--      disable_irq(drvdata->irq);
--
-       serio->id.type = SERIO_8042;
-       serio->open = ps2_gpio_open;
-       serio->close = ps2_gpio_close;
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index cc5dd17c0c26234badac94cab9b093c45022005d..0cd4095c0caab8516f79afd5b3d31dd1340d843c 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -248,7 +248,6 @@ rdma-hns-fix-the-wrong-type-of-return-value-of-the-i.patch
 rdma-hns-refactor-the-abnormal-interrupt-handler-fun.patch
 rdma-hns-fix-vf-triggering-pf-reset-in-abnormal-inte.patch
 rdma-hns-optimize-hem-allocation-performance.patch
-input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
 riscv-fix-fp-alignment-bug-in-perf_callchain_user.patch
 rdma-cxgb4-added-null-check-for-lookup_atid.patch
 rdma-irdma-fix-error-message-in-irdma_modify_qp_roce.patch

diff --git a/queue-5.4/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch b/queue-5.4/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
deleted file mode 100644 (file)
index 66d129c..0000000
--- a/queue-5.4/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 39b6522b9a68064fcf6920c1f8abee90650b8585 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 12 Sep 2024 11:30:13 +0800
-Subject: Input: ps2-gpio - use IRQF_NO_AUTOEN flag in request_irq()
-
-From: Jinjie Ruan <ruanjinjie@huawei.com>
-
-[ Upstream commit dcd18a3fb1228409dfc24373c5c6868a655810b0 ]
-
-disable_irq() after request_irq() still has a time gap in which
-interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
-disable IRQ auto-enable when request IRQ.
-
-Fixes: 9ee0a0558819 ("Input: PS/2 gpio bit banging driver for serio bus")
-Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
-Acked-by: Danilo Krummrich <dakr@kernel.org>
-Link: https://lore.kernel.org/r/20240912033013.2610949-1-ruanjinjie@huawei.com
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/input/serio/ps2-gpio.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
-index 8970b49ea09a2..b0238a8b5c210 100644
---- a/drivers/input/serio/ps2-gpio.c
-+++ b/drivers/input/serio/ps2-gpio.c
-@@ -374,16 +374,14 @@ static int ps2_gpio_probe(struct platform_device *pdev)
-       }
- 
-       error = devm_request_irq(dev, drvdata->irq, ps2_gpio_irq,
--                               IRQF_NO_THREAD, DRIVER_NAME, drvdata);
-+                               IRQF_NO_THREAD | IRQF_NO_AUTOEN, DRIVER_NAME,
-+                               drvdata);
-       if (error) {
-               dev_err(dev, "failed to request irq %d: %d\n",
-                       drvdata->irq, error);
-               goto err_free_serio;
-       }
- 
--      /* Keep irq disabled until serio->open is called. */
--      disable_irq(drvdata->irq);
--
-       serio->id.type = SERIO_8042;
-       serio->open = ps2_gpio_open;
-       serio->close = ps2_gpio_close;
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index e83b89a74fa47245fd1784e8c4676438e7079adc..3af8fba80140aa4950ba6b9e32c4fe981dc1e489 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -123,7 +123,6 @@ pinctrl-mvebu-use-devm_platform_get_and_ioremap_reso.patch
 pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch
 watchdog-imx_sc_wdt-don-t-disable-wdt-in-suspend.patch
 rdma-hns-optimize-hem-allocation-performance.patch
-input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
 riscv-fix-fp-alignment-bug-in-perf_callchain_user.patch
 rdma-cxgb4-added-null-check-for-lookup_atid.patch
 ntb-intel-fix-the-null-vs-is_err-bug-for-debugfs_cre.patch

diff --git a/queue-6.1/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch b/queue-6.1/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
deleted file mode 100644 (file)
index 2ab0705..0000000
--- a/queue-6.1/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 69727b0dd78b9f1a1e78b14bdac07db7cf55d134 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 12 Sep 2024 11:30:13 +0800
-Subject: Input: ps2-gpio - use IRQF_NO_AUTOEN flag in request_irq()
-
-From: Jinjie Ruan <ruanjinjie@huawei.com>
-
-[ Upstream commit dcd18a3fb1228409dfc24373c5c6868a655810b0 ]
-
-disable_irq() after request_irq() still has a time gap in which
-interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
-disable IRQ auto-enable when request IRQ.
-
-Fixes: 9ee0a0558819 ("Input: PS/2 gpio bit banging driver for serio bus")
-Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
-Acked-by: Danilo Krummrich <dakr@kernel.org>
-Link: https://lore.kernel.org/r/20240912033013.2610949-1-ruanjinjie@huawei.com
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/input/serio/ps2-gpio.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
-index bc1dc484389b4..ea67968fb112c 100644
---- a/drivers/input/serio/ps2-gpio.c
-+++ b/drivers/input/serio/ps2-gpio.c
-@@ -429,16 +429,14 @@ static int ps2_gpio_probe(struct platform_device *pdev)
-       }
- 
-       error = devm_request_irq(dev, drvdata->irq, ps2_gpio_irq,
--                               IRQF_NO_THREAD, DRIVER_NAME, drvdata);
-+                               IRQF_NO_THREAD | IRQF_NO_AUTOEN, DRIVER_NAME,
-+                               drvdata);
-       if (error) {
-               dev_err(dev, "failed to request irq %d: %d\n",
-                       drvdata->irq, error);
-               goto err_free_serio;
-       }
- 
--      /* Keep irq disabled until serio->open is called. */
--      disable_irq(drvdata->irq);
--
-       serio->id.type = SERIO_8042;
-       serio->open = ps2_gpio_open;
-       serio->close = ps2_gpio_close;
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 09a6ba7d6d5104aa5074194d285d80756402435d..a692d1a303c989c09543942f937ef0e5453b721a 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -240,7 +240,6 @@ rdma-hns-fix-spin_unlock_irqrestore-called-with-irqs.patch
 rdma-hns-fix-vf-triggering-pf-reset-in-abnormal-inte.patch
 rdma-hns-fix-1bit-ecc-recovery-address-in-non-4k-os.patch
 rdma-hns-optimize-hem-allocation-performance.patch
-input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
 riscv-fix-fp-alignment-bug-in-perf_callchain_user.patch
 rdma-cxgb4-added-null-check-for-lookup_atid.patch
 rdma-irdma-fix-error-message-in-irdma_modify_qp_roce.patch

diff --git a/queue-6.10/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch b/queue-6.10/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
deleted file mode 100644 (file)
index 1e4a265..0000000
--- a/queue-6.10/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2ef42bffa7d31df83f0f11e7f21acca2ab7df82a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 12 Sep 2024 11:30:13 +0800
-Subject: Input: ps2-gpio - use IRQF_NO_AUTOEN flag in request_irq()
-
-From: Jinjie Ruan <ruanjinjie@huawei.com>
-
-[ Upstream commit dcd18a3fb1228409dfc24373c5c6868a655810b0 ]
-
-disable_irq() after request_irq() still has a time gap in which
-interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
-disable IRQ auto-enable when request IRQ.
-
-Fixes: 9ee0a0558819 ("Input: PS/2 gpio bit banging driver for serio bus")
-Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
-Acked-by: Danilo Krummrich <dakr@kernel.org>
-Link: https://lore.kernel.org/r/20240912033013.2610949-1-ruanjinjie@huawei.com
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/input/serio/ps2-gpio.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
-index c3ff60859a035..fc8b7ff4ee086 100644
---- a/drivers/input/serio/ps2-gpio.c
-+++ b/drivers/input/serio/ps2-gpio.c
-@@ -429,16 +429,14 @@ static int ps2_gpio_probe(struct platform_device *pdev)
-       }
- 
-       error = devm_request_irq(dev, drvdata->irq, ps2_gpio_irq,
--                               IRQF_NO_THREAD, DRIVER_NAME, drvdata);
-+                               IRQF_NO_THREAD | IRQF_NO_AUTOEN, DRIVER_NAME,
-+                               drvdata);
-       if (error) {
-               dev_err(dev, "failed to request irq %d: %d\n",
-                       drvdata->irq, error);
-               goto err_free_serio;
-       }
- 
--      /* Keep irq disabled until serio->open is called. */
--      disable_irq(drvdata->irq);
--
-       serio->id.type = SERIO_8042;
-       serio->open = ps2_gpio_open;
-       serio->close = ps2_gpio_close;
--- 
-2.43.0
-

diff --git a/queue-6.10/series b/queue-6.10/series
index a889a53040c39452ab59343a28f9faec58dbdcd8..9206e5b1178e5339bc01c436081aefcbe2397f90 100644 (file)
--- a/queue-6.10/series
+++ b/queue-6.10/series
@@ -386,7 +386,6 @@ rdma-hns-optimize-hem-allocation-performance.patch
 rdma-hns-fix-restricted-__le16-degrades-to-integer-i.patch
 rdma-mlx5-obtain-upper-net-device-only-when-needed.patch
 pci-qcom-ep-enable-controller-resources-like-phy-onl.patch
-input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
 riscv-fix-fp-alignment-bug-in-perf_callchain_user.patch
 rdma-hns-fix-ah-error-counter-in-sw-stat-not-increas.patch
 rdma-cxgb4-added-null-check-for-lookup_atid.patch

diff --git a/queue-6.11/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch b/queue-6.11/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
deleted file mode 100644 (file)
index ea20f18..0000000
--- a/queue-6.11/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 75a485cc165a2c95eaa503bb082c07b1feb8ab97 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 12 Sep 2024 11:30:13 +0800
-Subject: Input: ps2-gpio - use IRQF_NO_AUTOEN flag in request_irq()
-
-From: Jinjie Ruan <ruanjinjie@huawei.com>
-
-[ Upstream commit dcd18a3fb1228409dfc24373c5c6868a655810b0 ]
-
-disable_irq() after request_irq() still has a time gap in which
-interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
-disable IRQ auto-enable when request IRQ.
-
-Fixes: 9ee0a0558819 ("Input: PS/2 gpio bit banging driver for serio bus")
-Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
-Acked-by: Danilo Krummrich <dakr@kernel.org>
-Link: https://lore.kernel.org/r/20240912033013.2610949-1-ruanjinjie@huawei.com
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/input/serio/ps2-gpio.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
-index 0c8b390b8b4f8..3a431395c4646 100644
---- a/drivers/input/serio/ps2-gpio.c
-+++ b/drivers/input/serio/ps2-gpio.c
-@@ -429,16 +429,14 @@ static int ps2_gpio_probe(struct platform_device *pdev)
-       }
- 
-       error = devm_request_irq(dev, drvdata->irq, ps2_gpio_irq,
--                               IRQF_NO_THREAD, DRIVER_NAME, drvdata);
-+                               IRQF_NO_THREAD | IRQF_NO_AUTOEN, DRIVER_NAME,
-+                               drvdata);
-       if (error) {
-               dev_err(dev, "failed to request irq %d: %d\n",
-                       drvdata->irq, error);
-               goto err_free_serio;
-       }
- 
--      /* Keep irq disabled until serio->open is called. */
--      disable_irq(drvdata->irq);
--
-       serio->id.type = SERIO_8042;
-       serio->open = ps2_gpio_open;
-       serio->close = ps2_gpio_close;
--- 
-2.43.0
-

diff --git a/queue-6.11/series b/queue-6.11/series
index 6a1454b991eaf9f5fd7e1eb6d25c53619ca626be..ab28e24f8375eda2890f5d26bad945d6762b4b72 100644 (file)
--- a/queue-6.11/series
+++ b/queue-6.11/series
@@ -430,7 +430,6 @@ rdma-hns-fix-restricted-__le16-degrades-to-integer-i.patch
 input-ims-pcu-fix-calling-interruptible-mutex.patch
 rdma-mlx5-obtain-upper-net-device-only-when-needed.patch
 pci-qcom-ep-enable-controller-resources-like-phy-onl.patch
-input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
 riscv-fix-fp-alignment-bug-in-perf_callchain_user.patch
 rdma-hns-fix-ah-error-counter-in-sw-stat-not-increas.patch
 rdma-cxgb4-added-null-check-for-lookup_atid.patch

diff --git a/queue-6.6/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch b/queue-6.6/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
deleted file mode 100644 (file)
index 81c3a09..0000000
--- a/queue-6.6/input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f8f4de2e51acd6cfbfd1b21d4115f6565e816d35 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 12 Sep 2024 11:30:13 +0800
-Subject: Input: ps2-gpio - use IRQF_NO_AUTOEN flag in request_irq()
-
-From: Jinjie Ruan <ruanjinjie@huawei.com>
-
-[ Upstream commit dcd18a3fb1228409dfc24373c5c6868a655810b0 ]
-
-disable_irq() after request_irq() still has a time gap in which
-interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
-disable IRQ auto-enable when request IRQ.
-
-Fixes: 9ee0a0558819 ("Input: PS/2 gpio bit banging driver for serio bus")
-Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
-Acked-by: Danilo Krummrich <dakr@kernel.org>
-Link: https://lore.kernel.org/r/20240912033013.2610949-1-ruanjinjie@huawei.com
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/input/serio/ps2-gpio.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
-index bc1dc484389b4..ea67968fb112c 100644
---- a/drivers/input/serio/ps2-gpio.c
-+++ b/drivers/input/serio/ps2-gpio.c
-@@ -429,16 +429,14 @@ static int ps2_gpio_probe(struct platform_device *pdev)
-       }
- 
-       error = devm_request_irq(dev, drvdata->irq, ps2_gpio_irq,
--                               IRQF_NO_THREAD, DRIVER_NAME, drvdata);
-+                               IRQF_NO_THREAD | IRQF_NO_AUTOEN, DRIVER_NAME,
-+                               drvdata);
-       if (error) {
-               dev_err(dev, "failed to request irq %d: %d\n",
-                       drvdata->irq, error);
-               goto err_free_serio;
-       }
- 
--      /* Keep irq disabled until serio->open is called. */
--      disable_irq(drvdata->irq);
--
-       serio->id.type = SERIO_8042;
-       serio->open = ps2_gpio_open;
-       serio->close = ps2_gpio_close;
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index db2d6322ff74d18a6584c240028f9e8f1a8eef04..b21693641b9e460624281a8fc8c02f34da8630a5 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -327,7 +327,6 @@ rdma-hns-fix-1bit-ecc-recovery-address-in-non-4k-os.patch
 rdma-hns-optimize-hem-allocation-performance.patch
 rdma-hns-fix-restricted-__le16-degrades-to-integer-i.patch
 rdma-mlx5-obtain-upper-net-device-only-when-needed.patch
-input-ps2-gpio-use-irqf_no_autoen-flag-in-request_ir.patch
 riscv-fix-fp-alignment-bug-in-perf_callchain_user.patch
 rdma-cxgb4-added-null-check-for-lookup_atid.patch
 rdma-irdma-fix-error-message-in-irdma_modify_qp_roce.patch