From 59f200ddb53b323aad6bd277dc1f5cb8cfbd646f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 6 May 2021 10:00:57 +0200 Subject: [PATCH] drop duplicated module device table patch from a bunch of trees --- .../asoc-ak4458-add-module_device_table.patch | 32 ------------------- .../asoc-ak5558-add-module_device_table.patch | 32 ------------------- queue-4.19/series | 2 -- .../asoc-ak4458-add-module_device_table.patch | 32 ------------------- .../asoc-ak5558-add-module_device_table.patch | 32 ------------------- queue-5.10/series | 2 -- .../asoc-ak4458-add-module_device_table.patch | 32 ------------------- .../asoc-ak5558-add-module_device_table.patch | 32 ------------------- queue-5.11/series | 2 -- .../asoc-ak4458-add-module_device_table.patch | 32 ------------------- .../asoc-ak5558-add-module_device_table.patch | 32 ------------------- queue-5.12/series | 2 -- .../asoc-ak4458-add-module_device_table.patch | 32 ------------------- .../asoc-ak5558-add-module_device_table.patch | 32 ------------------- queue-5.4/series | 2 -- 15 files changed, 330 deletions(-) delete mode 100644 queue-4.19/asoc-ak4458-add-module_device_table.patch delete mode 100644 queue-4.19/asoc-ak5558-add-module_device_table.patch delete mode 100644 queue-5.10/asoc-ak4458-add-module_device_table.patch delete mode 100644 queue-5.10/asoc-ak5558-add-module_device_table.patch delete mode 100644 queue-5.11/asoc-ak4458-add-module_device_table.patch delete mode 100644 queue-5.11/asoc-ak5558-add-module_device_table.patch delete mode 100644 queue-5.12/asoc-ak4458-add-module_device_table.patch delete mode 100644 queue-5.12/asoc-ak5558-add-module_device_table.patch delete mode 100644 queue-5.4/asoc-ak4458-add-module_device_table.patch delete mode 100644 queue-5.4/asoc-ak5558-add-module_device_table.patch diff --git a/queue-4.19/asoc-ak4458-add-module_device_table.patch b/queue-4.19/asoc-ak4458-add-module_device_table.patch deleted file mode 100644 index 4d0f03e3c1a..00000000000 --- a/queue-4.19/asoc-ak4458-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f84b4524005238fc9fd5cf615bb426fa40a99494 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:51 +0800 -Subject: ASoC: ak4458: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit f84b4524005238fc9fd5cf615bb426fa40a99494 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 08660086eff9 ("ASoC: ak4458: Add support for AK4458 DAC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-1-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak4458.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak4458.c -+++ b/sound/soc/codecs/ak4458.c -@@ -653,6 +653,7 @@ static struct i2c_driver ak4458_i2c_driv - .probe_new = ak4458_i2c_probe, - .remove = ak4458_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak4458_of_match); - - module_i2c_driver(ak4458_i2c_driver); - diff --git a/queue-4.19/asoc-ak5558-add-module_device_table.patch b/queue-4.19/asoc-ak5558-add-module_device_table.patch deleted file mode 100644 index 7be0b25b56c..00000000000 --- a/queue-4.19/asoc-ak5558-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:52 +0800 -Subject: ASoC: ak5558: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 920884777480 ("ASoC: ak5558: Add support for AK5558 ADC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-2-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak5558.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak5558.c -+++ b/sound/soc/codecs/ak5558.c -@@ -407,6 +407,7 @@ static struct i2c_driver ak5558_i2c_driv - .probe_new = ak5558_i2c_probe, - .remove = ak5558_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids); - - module_i2c_driver(ak5558_i2c_driver); - diff --git a/queue-4.19/series b/queue-4.19/series index 88aab2a175e..93d9d3194f2 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -9,7 +9,5 @@ iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_gen2_enqueue_hcmd.patch alsa-usb-audio-add-midi-quirk-for-vox-tonelab-ex.patch usb-add-lpm-quirk-for-lenovo-thinkpad-usb-c-dock-gen2-ethernet.patch usb-add-reset-resume-quirk-for-wd19-s-realtek-hub.patch -asoc-ak4458-add-module_device_table.patch -asoc-ak5558-add-module_device_table.patch platform-x86-thinkpad_acpi-correct-thermal-sensor-allocation.patch ovl-allow-upperdir-inside-lowerdir.patch diff --git a/queue-5.10/asoc-ak4458-add-module_device_table.patch b/queue-5.10/asoc-ak4458-add-module_device_table.patch deleted file mode 100644 index c7642f1b00b..00000000000 --- a/queue-5.10/asoc-ak4458-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f84b4524005238fc9fd5cf615bb426fa40a99494 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:51 +0800 -Subject: ASoC: ak4458: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit f84b4524005238fc9fd5cf615bb426fa40a99494 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 08660086eff9 ("ASoC: ak4458: Add support for AK4458 DAC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-1-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak4458.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak4458.c -+++ b/sound/soc/codecs/ak4458.c -@@ -823,6 +823,7 @@ static struct i2c_driver ak4458_i2c_driv - .probe_new = ak4458_i2c_probe, - .remove = ak4458_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak4458_of_match); - - module_i2c_driver(ak4458_i2c_driver); - diff --git a/queue-5.10/asoc-ak5558-add-module_device_table.patch b/queue-5.10/asoc-ak5558-add-module_device_table.patch deleted file mode 100644 index bdb9c74facd..00000000000 --- a/queue-5.10/asoc-ak5558-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:52 +0800 -Subject: ASoC: ak5558: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 920884777480 ("ASoC: ak5558: Add support for AK5558 ADC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-2-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak5558.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak5558.c -+++ b/sound/soc/codecs/ak5558.c -@@ -430,6 +430,7 @@ static struct i2c_driver ak5558_i2c_driv - .probe_new = ak5558_i2c_probe, - .remove = ak5558_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids); - - module_i2c_driver(ak5558_i2c_driver); - diff --git a/queue-5.10/series b/queue-5.10/series index 7bf8aa43e97..6b2cd8d647f 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -23,7 +23,5 @@ ovl-allow-upperdir-inside-lowerdir.patch alsa-usb-audio-add-midi-quirk-for-vox-tonelab-ex.patch usb-add-lpm-quirk-for-lenovo-thinkpad-usb-c-dock-gen2-ethernet.patch usb-add-reset-resume-quirk-for-wd19-s-realtek-hub.patch -asoc-ak4458-add-module_device_table.patch -asoc-ak5558-add-module_device_table.patch platform-x86-thinkpad_acpi-correct-thermal-sensor-allocation.patch perf-core-fix-unconditional-security_locked_down-call.patch diff --git a/queue-5.11/asoc-ak4458-add-module_device_table.patch b/queue-5.11/asoc-ak4458-add-module_device_table.patch deleted file mode 100644 index c7642f1b00b..00000000000 --- a/queue-5.11/asoc-ak4458-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f84b4524005238fc9fd5cf615bb426fa40a99494 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:51 +0800 -Subject: ASoC: ak4458: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit f84b4524005238fc9fd5cf615bb426fa40a99494 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 08660086eff9 ("ASoC: ak4458: Add support for AK4458 DAC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-1-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak4458.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak4458.c -+++ b/sound/soc/codecs/ak4458.c -@@ -823,6 +823,7 @@ static struct i2c_driver ak4458_i2c_driv - .probe_new = ak4458_i2c_probe, - .remove = ak4458_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak4458_of_match); - - module_i2c_driver(ak4458_i2c_driver); - diff --git a/queue-5.11/asoc-ak5558-add-module_device_table.patch b/queue-5.11/asoc-ak5558-add-module_device_table.patch deleted file mode 100644 index bdb9c74facd..00000000000 --- a/queue-5.11/asoc-ak5558-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:52 +0800 -Subject: ASoC: ak5558: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 920884777480 ("ASoC: ak5558: Add support for AK5558 ADC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-2-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak5558.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak5558.c -+++ b/sound/soc/codecs/ak5558.c -@@ -430,6 +430,7 @@ static struct i2c_driver ak5558_i2c_driv - .probe_new = ak5558_i2c_probe, - .remove = ak5558_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids); - - module_i2c_driver(ak5558_i2c_driver); - diff --git a/queue-5.11/series b/queue-5.11/series index 1deb2926542..a0f2ca82bce 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -25,7 +25,5 @@ alsa-usb-audio-add-midi-quirk-for-vox-tonelab-ex.patch alsa-usb-audio-fix-implicit-sync-clearance-at-stopping-stream.patch usb-add-lpm-quirk-for-lenovo-thinkpad-usb-c-dock-gen2-ethernet.patch usb-add-reset-resume-quirk-for-wd19-s-realtek-hub.patch -asoc-ak4458-add-module_device_table.patch -asoc-ak5558-add-module_device_table.patch platform-x86-thinkpad_acpi-correct-thermal-sensor-allocation.patch perf-core-fix-unconditional-security_locked_down-call.patch diff --git a/queue-5.12/asoc-ak4458-add-module_device_table.patch b/queue-5.12/asoc-ak4458-add-module_device_table.patch deleted file mode 100644 index c7642f1b00b..00000000000 --- a/queue-5.12/asoc-ak4458-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f84b4524005238fc9fd5cf615bb426fa40a99494 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:51 +0800 -Subject: ASoC: ak4458: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit f84b4524005238fc9fd5cf615bb426fa40a99494 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 08660086eff9 ("ASoC: ak4458: Add support for AK4458 DAC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-1-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak4458.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak4458.c -+++ b/sound/soc/codecs/ak4458.c -@@ -823,6 +823,7 @@ static struct i2c_driver ak4458_i2c_driv - .probe_new = ak4458_i2c_probe, - .remove = ak4458_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak4458_of_match); - - module_i2c_driver(ak4458_i2c_driver); - diff --git a/queue-5.12/asoc-ak5558-add-module_device_table.patch b/queue-5.12/asoc-ak5558-add-module_device_table.patch deleted file mode 100644 index bdb9c74facd..00000000000 --- a/queue-5.12/asoc-ak5558-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:52 +0800 -Subject: ASoC: ak5558: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 920884777480 ("ASoC: ak5558: Add support for AK5558 ADC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-2-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak5558.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak5558.c -+++ b/sound/soc/codecs/ak5558.c -@@ -430,6 +430,7 @@ static struct i2c_driver ak5558_i2c_driv - .probe_new = ak5558_i2c_probe, - .remove = ak5558_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids); - - module_i2c_driver(ak5558_i2c_driver); - diff --git a/queue-5.12/series b/queue-5.12/series index 7cd5dd3f364..0ebc2dd2c7c 100644 --- a/queue-5.12/series +++ b/queue-5.12/series @@ -11,7 +11,5 @@ alsa-usb-audio-add-midi-quirk-for-vox-tonelab-ex.patch alsa-usb-audio-fix-implicit-sync-clearance-at-stopping-stream.patch usb-add-lpm-quirk-for-lenovo-thinkpad-usb-c-dock-gen2-ethernet.patch usb-add-reset-resume-quirk-for-wd19-s-realtek-hub.patch -asoc-ak4458-add-module_device_table.patch -asoc-ak5558-add-module_device_table.patch platform-x86-thinkpad_acpi-correct-thermal-sensor-allocation.patch perf-core-fix-unconditional-security_locked_down-call.patch diff --git a/queue-5.4/asoc-ak4458-add-module_device_table.patch b/queue-5.4/asoc-ak4458-add-module_device_table.patch deleted file mode 100644 index 5670767eb5e..00000000000 --- a/queue-5.4/asoc-ak4458-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f84b4524005238fc9fd5cf615bb426fa40a99494 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:51 +0800 -Subject: ASoC: ak4458: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit f84b4524005238fc9fd5cf615bb426fa40a99494 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 08660086eff9 ("ASoC: ak4458: Add support for AK4458 DAC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-1-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak4458.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak4458.c -+++ b/sound/soc/codecs/ak4458.c -@@ -718,6 +718,7 @@ static struct i2c_driver ak4458_i2c_driv - .probe_new = ak4458_i2c_probe, - .remove = ak4458_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak4458_of_match); - - module_i2c_driver(ak4458_i2c_driver); - diff --git a/queue-5.4/asoc-ak5558-add-module_device_table.patch b/queue-5.4/asoc-ak5558-add-module_device_table.patch deleted file mode 100644 index 63ba33b1402..00000000000 --- a/queue-5.4/asoc-ak5558-add-module_device_table.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Wed, 24 Feb 2021 14:57:52 +0800 -Subject: ASoC: ak5558: Add MODULE_DEVICE_TABLE - -From: Shengjiu Wang - -commit 741c8397e5d0b339fb3e614a9ff5cb4bf7ae1a65 upstream. - -Add missed MODULE_DEVICE_TABLE for the driver can be loaded -automatically at boot. - -Fixes: 920884777480 ("ASoC: ak5558: Add support for AK5558 ADC driver") -Cc: -Signed-off-by: Shengjiu Wang -Link: https://lore.kernel.org/r/1614149872-25510-2-git-send-email-shengjiu.wang@nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/codecs/ak5558.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/soc/codecs/ak5558.c -+++ b/sound/soc/codecs/ak5558.c -@@ -400,6 +400,7 @@ static struct i2c_driver ak5558_i2c_driv - .probe_new = ak5558_i2c_probe, - .remove = ak5558_i2c_remove, - }; -+MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids); - - module_i2c_driver(ak5558_i2c_driver); - diff --git a/queue-5.4/series b/queue-5.4/series index 73c2907268a..2e6e5660c37 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -13,8 +13,6 @@ perf-ftrace-fix-access-to-pid-in-array-when-setting-.patch alsa-usb-audio-add-midi-quirk-for-vox-tonelab-ex.patch usb-add-lpm-quirk-for-lenovo-thinkpad-usb-c-dock-gen2-ethernet.patch usb-add-reset-resume-quirk-for-wd19-s-realtek-hub.patch -asoc-ak4458-add-module_device_table.patch -asoc-ak5558-add-module_device_table.patch platform-x86-thinkpad_acpi-correct-thermal-sensor-allocation.patch scsi-ufs-unlock-on-a-couple-error-paths.patch ovl-allow-upperdir-inside-lowerdir.patch -- 2.47.3