disable WUSB (Wireless USB) as HW doesn't exist

It's soon to move to staging in preparation for removal:
https://www.spinics.net/lists/linux-crypto/msg39327.html

18 files changed, 45 insertions, 60 deletions

diff --git a/configs/fedora/generic/CONFIG_USB_HWA_HCD b/configs/fedora/generic/CONFIG_USB_HWA_HCD
index 6b6040687..b493c1251 100644
--- a/configs/fedora/generic/CONFIG_USB_HWA_HCD
+++ b/configs/fedora/generic/CONFIG_USB_HWA_HCD
@@ -1 +1 @@
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
diff --git a/configs/fedora/generic/CONFIG_USB_WUSB b/configs/fedora/generic/CONFIG_USB_WUSB
index 8994ea5fc..c47897cdb 100644
--- a/configs/fedora/generic/CONFIG_USB_WUSB
+++ b/configs/fedora/generic/CONFIG_USB_WUSB
@@ -1 +1 @@
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB is not set
diff --git a/configs/fedora/generic/CONFIG_USB_WUSB_CBAF b/configs/fedora/generic/CONFIG_USB_WUSB_CBAF
index e22af10d7..d5b550cf3 100644
--- a/configs/fedora/generic/CONFIG_USB_WUSB_CBAF
+++ b/configs/fedora/generic/CONFIG_USB_WUSB_CBAF
@@ -1 +1 @@
-CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF is not set
diff --git a/configs/fedora/generic/CONFIG_USB_WUSB_CBAF_DEBUG b/configs/fedora/generic/CONFIG_USB_WUSB_CBAF_DEBUG
deleted file mode 100644
index ce6209b5a..000000000
--- a/configs/fedora/generic/CONFIG_USB_WUSB_CBAF_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 395594774..53126dcce 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6702,7 +6702,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -6907,9 +6907,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index dcd01e6cf..13839e528 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6680,7 +6680,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -6885,9 +6885,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index ab5b4935a..d7d13ffd0 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6991,7 +6991,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_INVENTRA_DMA=y
@@ -7206,9 +7206,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index cda24c143..6d06da51a 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6644,7 +6644,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -6849,9 +6849,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index cee73bff9..0e68d1942 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6623,7 +6623,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -6828,9 +6828,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 3d097951b..a8d3bf129 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6970,7 +6970,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_INVENTRA_DMA=y
@@ -7185,9 +7185,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 21b6d14ec..1cd402c5d 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -6083,7 +6083,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -6275,9 +6275,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 5f2165aff..f3c44efd9 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -6062,7 +6062,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -6254,9 +6254,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index f96426265..136b35d10 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5704,7 +5704,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -5897,9 +5897,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 8f5ac62f8..ba3f2dab3 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5681,7 +5681,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -5874,9 +5874,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 6968894cc..bee29391c 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5646,7 +5646,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -5836,9 +5836,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 3445f1ba9..2a90465f2 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5623,7 +5623,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -5813,9 +5813,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index e6ea26c57..a5294a976 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6140,7 +6140,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -6332,9 +6332,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 34d92dd7c..3b8cf116a 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6119,7 +6119,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
-CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USBIP_CORE=m
@@ -6311,9 +6311,8 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_WUSB is not set
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set