USB: Move wusbcore and UWB to staging as it is obsolete
Subsystems (3)
Greg Kroah-Hartman
maintainerPATCH 1/1 USB: Move wusbcore and UWB to staging as it is obsolete
The UWB and wusbcore code is long obsolete, so let us just move the code out of the real part of the kernel and into the drivers/staging/ location with plans to remove it entirely in a few releases.
---
MAINTAINERS | 15 +++-------
drivers/Kconfig | 2 --
drivers/Makefile | 1 -
drivers/staging/Kconfig | 3 ++
drivers/staging/Makefile | 2 ++
drivers/{ => staging}/uwb/Kconfig | 0
drivers/{ => staging}/uwb/Makefile | 0
drivers/staging/uwb/TODO | 8 ++++++
drivers/{ => staging}/uwb/address.c | 0
drivers/{ => staging}/uwb/allocator.c | 2 +-
drivers/{ => staging}/uwb/beacon.c | 0
drivers/{ => staging}/uwb/driver.c | 0
drivers/{ => staging}/uwb/drp-avail.c | 0
drivers/{ => staging}/uwb/drp-ie.c | 2 +-
drivers/{ => staging}/uwb/drp.c | 0
drivers/{ => staging}/uwb/est.c | 0
drivers/{ => staging}/uwb/hwa-rc.c | 6 ++--
drivers/{ => staging}/uwb/i1480/Makefile | 0
drivers/{ => staging}/uwb/i1480/dfu/Makefile | 0
drivers/{ => staging}/uwb/i1480/dfu/dfu.c | 2 +-
.../{ => staging}/uwb/i1480/dfu/i1480-dfu.h | 2 +-
drivers/{ => staging}/uwb/i1480/dfu/mac.c | 2 +-
drivers/{ => staging}/uwb/i1480/dfu/phy.c | 2 +-
drivers/{ => staging}/uwb/i1480/dfu/usb.c | 6 ++--
drivers/{ => staging}/uwb/i1480/i1480-est.c | 2 +-
drivers/{ => staging}/uwb/ie-rcv.c | 0
drivers/{ => staging}/uwb/ie.c | 0
.../staging/uwb/include}/debug-cmd.h | 0
.../staging/uwb/include}/spec.h | 0
.../uwb => drivers/staging/uwb/include}/umc.h | 0
.../staging/uwb/include}/whci.h | 0
drivers/{ => staging}/uwb/lc-dev.c | 0
drivers/{ => staging}/uwb/lc-rc.c | 0
drivers/{ => staging}/uwb/neh.c | 0
drivers/{ => staging}/uwb/pal.c | 2 +-
drivers/{ => staging}/uwb/radio.c | 2 +-
drivers/{ => staging}/uwb/reset.c | 0
drivers/{ => staging}/uwb/rsv.c | 2 +-
drivers/{ => staging}/uwb/scan.c | 0
drivers/{ => staging}/uwb/umc-bus.c | 2 +-
drivers/{ => staging}/uwb/umc-dev.c | 2 +-
drivers/{ => staging}/uwb/umc-drv.c | 2 +-
drivers/{ => staging}/uwb/uwb-debug.c | 3 +-
drivers/{ => staging}/uwb/uwb-internal.h | 2 +-
{include/linux => drivers/staging/uwb}/uwb.h | 2 +-
drivers/{ => staging}/uwb/uwbd.c | 0
drivers/{ => staging}/uwb/whc-rc.c | 6 ++--
drivers/{ => staging}/uwb/whci.c | 4 +--
.../staging/wusbcore/Documentation}/wusb-cbaf | 0
.../Documentation}/wusb-design-overview.rst | 0
drivers/{usb => staging}/wusbcore/Kconfig | 1 +
drivers/{usb => staging}/wusbcore/Makefile | 2 ++
drivers/staging/wusbcore/TODO | 8 ++++++
drivers/{usb => staging}/wusbcore/cbaf.c | 6 ++--
drivers/{usb => staging}/wusbcore/crypto.c | 4 +--
drivers/{usb => staging}/wusbcore/dev-sysfs.c | 0
.../{usb => staging}/wusbcore/devconnect.c | 0
drivers/staging/wusbcore/host/Kconfig | 28 +++++++++++++++++++
drivers/staging/wusbcore/host/Makefile | 3 ++
.../{usb => staging/wusbcore}/host/hwa-hc.c | 4 +--
.../wusbcore}/host/whci/Makefile | 0
.../{usb => staging/wusbcore}/host/whci/asl.c | 4 +--
.../wusbcore}/host/whci/debug.c | 2 +-
.../{usb => staging/wusbcore}/host/whci/hcd.c | 4 +--
.../{usb => staging/wusbcore}/host/whci/hw.c | 4 +--
.../wusbcore}/host/whci/init.c | 4 +--
.../{usb => staging/wusbcore}/host/whci/int.c | 4 +--
.../{usb => staging/wusbcore}/host/whci/pzl.c | 4 +--
.../wusbcore}/host/whci/qset.c | 4 +--
.../wusbcore}/host/whci/whcd.h | 4 +--
.../wusbcore}/host/whci/whci-hc.h | 0
.../wusbcore}/host/whci/wusb.c | 4 +--
.../staging/wusbcore/include}/association.h | 0
.../staging/wusbcore/include}/wusb-wa.h | 0
.../staging/wusbcore/include}/wusb.h | 2 +-
drivers/{usb => staging}/wusbcore/mmc.c | 2 +-
drivers/{usb => staging}/wusbcore/pal.c | 0
.../{usb => staging}/wusbcore/reservation.c | 2 +-
drivers/{usb => staging}/wusbcore/rh.c | 0
drivers/{usb => staging}/wusbcore/security.c | 0
drivers/{usb => staging}/wusbcore/wa-hc.c | 0
drivers/{usb => staging}/wusbcore/wa-hc.h | 6 ++--
drivers/{usb => staging}/wusbcore/wa-nep.c | 0
drivers/{usb => staging}/wusbcore/wa-rpipe.c | 0
drivers/{usb => staging}/wusbcore/wa-xfer.c | 0
drivers/{usb => staging}/wusbcore/wusbhc.c | 0
drivers/{usb => staging}/wusbcore/wusbhc.h | 4 +--
drivers/usb/Kconfig | 2 --
drivers/usb/Makefile | 2 --
drivers/usb/host/Kconfig | 26 -----------------
drivers/usb/host/Makefile | 3 --
91 files changed, 120 insertions(+), 109 deletions(-)
rename drivers/{ => staging}/uwb/Kconfig (100%)
rename drivers/{ => staging}/uwb/Makefile (100%)
create mode 100644 drivers/staging/uwb/TODO
rename drivers/{ => staging}/uwb/address.c (100%)
rename drivers/{ => staging}/uwb/allocator.c (99%)
rename drivers/{ => staging}/uwb/beacon.c (100%)
rename drivers/{ => staging}/uwb/driver.c (100%)
rename drivers/{ => staging}/uwb/drp-avail.c (100%)
rename drivers/{ => staging}/uwb/drp-ie.c (99%)
rename drivers/{ => staging}/uwb/drp.c (100%)
rename drivers/{ => staging}/uwb/est.c (100%)
rename drivers/{ => staging}/uwb/hwa-rc.c (99%)
rename drivers/{ => staging}/uwb/i1480/Makefile (100%)
rename drivers/{ => staging}/uwb/i1480/dfu/Makefile (100%)
rename drivers/{ => staging}/uwb/i1480/dfu/dfu.c (99%)
rename drivers/{ => staging}/uwb/i1480/dfu/i1480-dfu.h (99%)
rename drivers/{ => staging}/uwb/i1480/dfu/mac.c (99%)
rename drivers/{ => staging}/uwb/i1480/dfu/phy.c (99%)
rename drivers/{ => staging}/uwb/i1480/dfu/usb.c (99%)
rename drivers/{ => staging}/uwb/i1480/i1480-est.c (99%)
rename drivers/{ => staging}/uwb/ie-rcv.c (100%)
rename drivers/{ => staging}/uwb/ie.c (100%)
rename {include/linux/uwb => drivers/staging/uwb/include}/debug-cmd.h (100%)
rename {include/linux/uwb => drivers/staging/uwb/include}/spec.h (100%)
rename {include/linux/uwb => drivers/staging/uwb/include}/umc.h (100%)
rename {include/linux/uwb => drivers/staging/uwb/include}/whci.h (100%)
rename drivers/{ => staging}/uwb/lc-dev.c (100%)
rename drivers/{ => staging}/uwb/lc-rc.c (100%)
rename drivers/{ => staging}/uwb/neh.c (100%)
rename drivers/{ => staging}/uwb/pal.c (99%)
rename drivers/{ => staging}/uwb/radio.c (99%)
rename drivers/{ => staging}/uwb/reset.c (100%)
rename drivers/{ => staging}/uwb/rsv.c (99%)
rename drivers/{ => staging}/uwb/scan.c (100%)
rename drivers/{ => staging}/uwb/umc-bus.c (99%)
rename drivers/{ => staging}/uwb/umc-dev.c (98%)
rename drivers/{ => staging}/uwb/umc-drv.c (96%)
rename drivers/{ => staging}/uwb/uwb-debug.c (99%)
rename drivers/{ => staging}/uwb/uwb-internal.h (99%)
rename {include/linux => drivers/staging/uwb}/uwb.h (99%)
rename drivers/{ => staging}/uwb/uwbd.c (100%)
rename drivers/{ => staging}/uwb/whc-rc.c (99%)
rename drivers/{ => staging}/uwb/whci.c (99%)
rename {Documentation/usb => drivers/staging/wusbcore/Documentation}/wusb-cbaf (100%)
rename {Documentation/usb => drivers/staging/wusbcore/Documentation}/wusb-design-overview.rst (100%)
rename drivers/{usb => staging}/wusbcore/Kconfig (95%)
rename drivers/{usb => staging}/wusbcore/Makefile (96%)
create mode 100644 drivers/staging/wusbcore/TODO
rename drivers/{usb => staging}/wusbcore/cbaf.c (99%)
rename drivers/{usb => staging}/wusbcore/crypto.c (99%)
rename drivers/{usb => staging}/wusbcore/dev-sysfs.c (100%)
rename drivers/{usb => staging}/wusbcore/devconnect.c (100%)
create mode 100644 drivers/staging/wusbcore/host/Kconfig
create mode 100644 drivers/staging/wusbcore/host/Makefile
rename drivers/{usb => staging/wusbcore}/host/hwa-hc.c (99%)
rename drivers/{usb => staging/wusbcore}/host/whci/Makefile (100%)
rename drivers/{usb => staging/wusbcore}/host/whci/asl.c (99%)
rename drivers/{usb => staging/wusbcore}/host/whci/debug.c (99%)
rename drivers/{usb => staging/wusbcore}/host/whci/hcd.c (99%)
rename drivers/{usb => staging/wusbcore}/host/whci/hw.c (97%)
rename drivers/{usb => staging/wusbcore}/host/whci/init.c (98%)
rename drivers/{usb => staging/wusbcore}/host/whci/int.c (96%)
rename drivers/{usb => staging/wusbcore}/host/whci/pzl.c (99%)
rename drivers/{usb => staging/wusbcore}/host/whci/qset.c (99%)
rename drivers/{usb => staging/wusbcore}/host/whci/whcd.h (98%)
rename drivers/{usb => staging/wusbcore}/host/whci/whci-hc.h (100%)
rename drivers/{usb => staging/wusbcore}/host/whci/wusb.c (98%)
rename {include/linux/usb => drivers/staging/wusbcore/include}/association.h (100%)
rename {include/linux/usb => drivers/staging/wusbcore/include}/wusb-wa.h (100%)
rename {include/linux/usb => drivers/staging/wusbcore/include}/wusb.h (99%)
rename drivers/{usb => staging}/wusbcore/mmc.c (99%)
rename drivers/{usb => staging}/wusbcore/pal.c (100%)
rename drivers/{usb => staging}/wusbcore/reservation.c (99%)
rename drivers/{usb => staging}/wusbcore/rh.c (100%)
rename drivers/{usb => staging}/wusbcore/security.c (100%)
rename drivers/{usb => staging}/wusbcore/wa-hc.c (100%)
rename drivers/{usb => staging}/wusbcore/wa-hc.h (99%)
rename drivers/{usb => staging}/wusbcore/wa-nep.c (100%)
rename drivers/{usb => staging}/wusbcore/wa-rpipe.c (100%)
rename drivers/{usb => staging}/wusbcore/wa-xfer.c (100%)
rename drivers/{usb => staging}/wusbcore/wusbhc.c (100%)
rename drivers/{usb => staging}/wusbcore/wusbhc.h (99%)MAINTAINERS +4 -11
@@ -3800,14 +3800,9 @@ F: scripts/sign-file.c F: scripts/extract-cert.c CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: -L: [email protected] +L: [email protected] S: Orphan -F: Documentation/usb/wusb-design-overview.rst -F: Documentation/usb/wusb-cbaf -F: drivers/usb/host/hwa-hc.c -F: drivers/usb/host/whci/ -F: drivers/usb/wusbcore/ -F: include/linux/usb/wusb* +F: drivers/staging/wbusbcore/ CFAG12864B LCD DRIVER M: Miguel Ojeda Sandonis <[email protected]>
@@ -16447,11 +16442,9 @@ F: drivers/usb/common/ulpi.c F: include/linux/ulpi/ ULTRA-WIDEBAND (UWB) SUBSYSTEM: -L: [email protected] +L: [email protected] S: Orphan -F: drivers/uwb/ -F: include/linux/uwb.h -F: include/linux/uwb/ +F: drivers/staging/uwb/ UNICODE SUBSYSTEM: M: Gabriel Krisman Bertazi <[email protected]>
drivers/Kconfig +0 -2
@@ -108,8 +108,6 @@ source "drivers/hid/Kconfig" source "drivers/usb/Kconfig" -source "drivers/uwb/Kconfig" - source "drivers/mmc/Kconfig" source "drivers/memstick/Kconfig"
drivers/Makefile +0 -1
@@ -100,7 +100,6 @@ obj-$(CONFIG_ZORRO) += zorro/ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ obj-$(CONFIG_PARIDE) += block/paride/ obj-$(CONFIG_TC) += tc/ -obj-$(CONFIG_UWB) += uwb/ obj-$(CONFIG_USB_PHY) += usb/ obj-$(CONFIG_USB) += usb/ obj-$(CONFIG_USB_SUPPORT) += usb/
drivers/staging/Kconfig +3 -0
@@ -120,4 +120,7 @@ source "drivers/staging/kpc2000/Kconfig" source "drivers/staging/isdn/Kconfig" +source "drivers/staging/wusbcore/Kconfig" +source "drivers/staging/uwb/Kconfig" + endif # STAGING
drivers/staging/Makefile +2 -0
@@ -50,3 +50,5 @@ obj-$(CONFIG_EROFS_FS) += erofs/ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_KPC2000) += kpc2000/ obj-$(CONFIG_ISDN_CAPI) += isdn/ +obj-$(CONFIG_UWB) += uwb/ +obj-$(CONFIG_USB_WUSB) += wusbcore/
drivers/staging/uwb/Kconfig renamed from drivers/uwb/Kconfig +0 -0
drivers/staging/uwb/Makefile renamed from drivers/uwb/Makefile +0 -0
drivers/staging/uwb/TODO new file +8 -0
@@ -0,0 +1,8 @@ +TODO: Remove in late 2019 unless there are users + +There seems to not be any real wireless USB devices anywhere in the wild +anymore. It turned out to be a failed technology :( + +This will be removed from the tree if no one objects. + +Greg Kroah-Hartman <[email protected]>
drivers/staging/uwb/address.c renamed from drivers/uwb/address.c +0 -0
drivers/staging/uwb/allocator.c renamed from drivers/uwb/allocator.c +1 -1
@@ -6,7 +6,7 @@*/ #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/uwb.h> +#include "uwb.h" #include "uwb-internal.h"
drivers/staging/uwb/beacon.c renamed from drivers/uwb/beacon.c +0 -0
drivers/staging/uwb/driver.c renamed from drivers/uwb/driver.c +0 -0
drivers/staging/uwb/drp-avail.c renamed from drivers/uwb/drp-avail.c +0 -0
drivers/staging/uwb/drp-ie.c renamed from drivers/uwb/drp-ie.c +1 -1
@@ -8,8 +8,8 @@#include <linux/kernel.h> #include <linux/random.h> #include <linux/slab.h> -#include <linux/uwb.h> +#include "uwb.h" #include "uwb-internal.h"
drivers/staging/uwb/drp.c renamed from drivers/uwb/drp.c +0 -0
drivers/staging/uwb/est.c renamed from drivers/uwb/est.c +0 -0
drivers/staging/uwb/hwa-rc.c renamed from drivers/uwb/hwa-rc.c +3 -3
@@ -38,9 +38,9 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/usb.h> -#include <linux/usb/wusb.h> -#include <linux/usb/wusb-wa.h> -#include <linux/uwb.h> +#include "../wusbcore/include/wusb.h" +#include "../wusbcore/include/wusb-wa.h" +#include "uwb.h" #include "uwb-internal.h"
drivers/staging/uwb/i1480/Makefile renamed from drivers/uwb/i1480/Makefile +0 -0
drivers/staging/uwb/i1480/dfu/Makefile renamed from drivers/uwb/i1480/dfu/Makefile +0 -0
drivers/staging/uwb/i1480/dfu/dfu.c renamed from drivers/uwb/i1480/dfu/dfu.c +1 -1
@@ -17,9 +17,9 @@#include <linux/delay.h> #include <linux/pci.h> #include <linux/device.h> -#include <linux/uwb.h> #include <linux/random.h> #include <linux/export.h> +#include "../../uwb.h" /* * i1480_rceb_check - Check RCEB for expected field values
drivers/staging/uwb/i1480/dfu/i1480-dfu.h renamed from drivers/uwb/i1480/dfu/i1480-dfu.h +1 -1
@@ -50,9 +50,9 @@#ifndef __i1480_DFU_H__#define __i1480_DFU_H__ -#include <linux/uwb/spec.h> #include <linux/types.h> #include <linux/completion.h> +#include "../../include/spec.h" #define i1480_FW_UPLOAD_MODE_MASK (cpu_to_le32(0x00000018))
drivers/staging/uwb/i1480/dfu/mac.c renamed from drivers/uwb/i1480/dfu/mac.c +1 -1
@@ -15,7 +15,7 @@#include <linux/delay.h> #include <linux/firmware.h> #include <linux/slab.h> -#include <linux/uwb.h> +#include "../../uwb.h" #include "i1480-dfu.h" /*
drivers/staging/uwb/i1480/dfu/phy.c renamed from drivers/uwb/i1480/dfu/phy.c +1 -1
@@ -15,7 +15,7 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/firmware.h> -#include <linux/usb/wusb.h> +#include "../../../wusbcore/include/wusb.h" #include "i1480-dfu.h"
drivers/staging/uwb/i1480/dfu/usb.c renamed from drivers/uwb/i1480/dfu/usb.c +3 -3
@@ -25,9 +25,9 @@#include <linux/interrupt.h> #include <linux/slab.h> #include <linux/delay.h> -#include <linux/uwb.h> -#include <linux/usb/wusb.h> -#include <linux/usb/wusb-wa.h> +#include "../../uwb.h" +#include "../../../wusbcore/include/wusb.h" +#include "../../../wusbcore/include/wusb-wa.h" #include "i1480-dfu.h" struct i1480_usb {
drivers/staging/uwb/i1480/i1480-est.c renamed from drivers/uwb/i1480/i1480-est.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/usb.h> -#include <linux/uwb.h> +#include "../uwb.h" #include "dfu/i1480-dfu.h"
drivers/staging/uwb/ie-rcv.c renamed from drivers/uwb/ie-rcv.c +0 -0
drivers/staging/uwb/ie.c renamed from drivers/uwb/ie.c +0 -0
drivers/staging/uwb/include/debug-cmd.h renamed from include/linux/uwb/debug-cmd.h +0 -0
drivers/staging/uwb/include/spec.h renamed from include/linux/uwb/spec.h +0 -0
drivers/staging/uwb/include/umc.h renamed from include/linux/uwb/umc.h +0 -0
drivers/staging/uwb/include/whci.h renamed from include/linux/uwb/whci.h +0 -0
drivers/staging/uwb/lc-dev.c renamed from drivers/uwb/lc-dev.c +0 -0
drivers/staging/uwb/lc-rc.c renamed from drivers/uwb/lc-rc.c +0 -0
drivers/staging/uwb/neh.c renamed from drivers/uwb/neh.c +0 -0
drivers/staging/uwb/pal.c renamed from drivers/uwb/pal.c +1 -1
@@ -6,9 +6,9 @@*/ #include <linux/kernel.h> #include <linux/debugfs.h> -#include <linux/uwb.h> #include <linux/export.h> +#include "uwb.h" #include "uwb-internal.h" /**
drivers/staging/uwb/radio.c renamed from drivers/uwb/radio.c +1 -1
@@ -5,9 +5,9 @@* Copyright (C) 2008 Cambridge Silicon Radio Ltd. */ #include <linux/kernel.h> -#include <linux/uwb.h> #include <linux/export.h> +#include "uwb.h" #include "uwb-internal.h"
drivers/staging/uwb/reset.c renamed from drivers/uwb/reset.c +0 -0
drivers/staging/uwb/rsv.c renamed from drivers/uwb/rsv.c +1 -1
@@ -5,11 +5,11 @@* Copyright (C) 2008 Cambridge Silicon Radio Ltd. */ #include <linux/kernel.h> -#include <linux/uwb.h> #include <linux/slab.h> #include <linux/random.h> #include <linux/export.h> +#include "uwb.h" #include "uwb-internal.h" static void uwb_rsv_timer (struct timer_list *t);
drivers/staging/uwb/scan.c renamed from drivers/uwb/scan.c +0 -0
drivers/staging/uwb/umc-bus.c renamed from drivers/uwb/umc-bus.c +1 -1
@@ -8,8 +8,8 @@#include <linux/sysfs.h> #include <linux/workqueue.h> #include <linux/module.h> -#include <linux/uwb/umc.h> #include <linux/pci.h> +#include "include/umc.h" static int umc_bus_pre_reset_helper (struct device *dev,void *data) {
drivers/staging/uwb/umc-dev.c renamed from drivers/uwb/umc-dev.c +1 -1
@@ -7,7 +7,7 @@#include <linux/kernel.h> #include <linux/export.h> #include <linux/slab.h> -#include <linux/uwb/umc.h> +#include "include/umc.h" static void umc_device_release (struct device *dev) {
drivers/staging/uwb/umc-drv.c renamed from drivers/uwb/umc-drv.c +1 -1
@@ -6,7 +6,7 @@*/ #include <linux/kernel.h> #include <linux/export.h> -#include <linux/uwb/umc.h> +#include "include/umc.h" int __umc_driver_register (struct umc_driver *umc_drv,struct module *module,const char *mod_name)
drivers/staging/uwb/uwb-debug.c renamed from drivers/uwb/uwb-debug.c +1 -2
@@ -19,8 +19,7 @@#include <linux/uaccess.h> #include <linux/seq_file.h> -#include <linux/uwb/debug-cmd.h> - +#include "include/debug-cmd.h" #include "uwb-internal.h" /*
drivers/staging/uwb/uwb-internal.h renamed from drivers/uwb/uwb-internal.h +1 -1
@@ -17,8 +17,8 @@#include <linux/kernel.h> #include <linux/device.h> -#include <linux/uwb.h> #include <linux/mutex.h> +#include "uwb.h" struct uwb_beca_e ;
drivers/staging/uwb/uwb.h renamed from include/linux/uwb.h +1 -1
@@ -18,8 +18,8 @@#include <linux/timer.h> #include <linux/wait.h> #include <linux/workqueue.h> -#include <linux/uwb/spec.h> #include <asm/page.h> +#include "include/spec.h" struct uwb_dev ;struct uwb_beca_e ;
drivers/staging/uwb/uwbd.c renamed from drivers/uwb/uwbd.c +0 -0
drivers/staging/uwb/whc-rc.c renamed from drivers/uwb/whc-rc.c +3 -3
@@ -33,9 +33,9 @@#include <linux/interrupt.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <linux/uwb.h> -#include <linux/uwb/whci.h> -#include <linux/uwb/umc.h> +#include "uwb.h" +#include "include/whci.h" +#include "include/umc.h" #include "uwb-internal.h"
drivers/staging/uwb/whci.c renamed from drivers/uwb/whci.c +2 -2
@@ -10,8 +10,8 @@#include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/slab.h> -#include <linux/uwb/whci.h> -#include <linux/uwb/umc.h> +#include "include/whci.h" +#include "include/umc.h" struct whci_card {struct pci_dev *pci;
drivers/staging/wusbcore/Documentation/wusb-cbaf renamed from Documentation/usb/wusb-cbaf +0 -0
drivers/staging/wusbcore/Documentation/wusb-design-overview.rst renamed from Documentation/usb/wusb-design-overview.rst +0 -0
drivers/staging/wusbcore/Kconfig renamed from drivers/usb/wusbcore/Kconfig +1 -0
@@ -36,3 +36,4 @@ config USB_WUSB_CBAF_DEBUG to the system log. Select this if you are having a problem with CBA support and want to see more of what is going on. +source "drivers/staging/wusbcore/host/Kconfig"
drivers/staging/wusbcore/Makefile renamed from drivers/usb/wusbcore/Makefile +2 -0
@@ -24,3 +24,5 @@ wusb-wa-y := \ wa-nep.o \ wa-rpipe.o \ wa-xfer.o + +obj-y += host/
drivers/staging/wusbcore/TODO new file +8 -0
@@ -0,0 +1,8 @@ +TODO: Remove in late 2019 unless there are users + +There seems to not be any real wireless USB devices anywhere in the wild +anymore. It turned out to be a failed technology :( + +This will be removed from the tree if no one objects. + +Greg Kroah-Hartman <[email protected]>
drivers/staging/wusbcore/cbaf.c renamed from drivers/usb/wusbcore/cbaf.c +3 -3
@@ -80,9 +80,9 @@#include <linux/random.h> #include <linux/slab.h> #include <linux/mutex.h> -#include <linux/uwb.h> -#include <linux/usb/wusb.h> -#include <linux/usb/association.h> +#include "../uwb/uwb.h" +#include "include/wusb.h" +#include "include/association.h" #define CBA_NAME_LEN 0x40/* [WUSB-AM] table 4-7 */
drivers/staging/wusbcore/crypto.c renamed from drivers/usb/wusbcore/crypto.c +2 -2
@@ -38,10 +38,10 @@#include <linux/crypto.h> #include <linux/module.h> #include <linux/err.h> -#include <linux/uwb.h> #include <linux/slab.h> -#include <linux/usb/wusb.h> #include <linux/scatterlist.h> +#include "../uwb/uwb.h" +#include "include/wusb.h" static int debug_crypto_verify;
drivers/staging/wusbcore/dev-sysfs.c renamed from drivers/usb/wusbcore/dev-sysfs.c +0 -0
drivers/staging/wusbcore/devconnect.c renamed from drivers/usb/wusbcore/devconnect.c +0 -0
drivers/staging/wusbcore/host/Kconfig new file +28 -0
@@ -0,0 +1,28 @@ +# SPDX-License-Identifier: GPL-2.0 + +config USB_WHCI_HCD + tristate "Wireless USB Host Controller Interface (WHCI) driver" + depends on USB_PCI && USB && UWB + select USB_WUSB + select UWB_WHCI + help + A driver for PCI-based Wireless USB Host Controllers that are + compliant with the WHCI specification. + + To compile this driver a module, choose M here: the module + will be called "whci-hcd". + +config USB_HWA_HCD + tristate "Host Wire Adapter (HWA) driver" + depends on USB && UWB + select USB_WUSB + select UWB_HWA + help + This driver enables you to connect Wireless USB devices to + your system using a Host Wire Adaptor USB dongle. This is an + UWB Radio Controller and WUSB Host Controller connected to + your machine via USB (specified in WUSB1.0). + + To compile this driver a module, choose M here: the module + will be called "hwa-hc". +
drivers/staging/wusbcore/host/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_USB_WHCI_HCD) += whci/ +obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
drivers/staging/wusbcore/host/hwa-hc.c renamed from drivers/usb/host/hwa-hc.c +2 -2
@@ -45,8 +45,8 @@#include <linux/workqueue.h> #include <linux/wait.h> #include <linux/completion.h> -#include "../wusbcore/wa-hc.h" -#include "../wusbcore/wusbhc.h" +#include "../wa-hc.h" +#include "../wusbhc.h" struct hwahc {struct wusbhc wusbhc;/* has to be 1st */
drivers/staging/wusbcore/host/whci/Makefile renamed from drivers/usb/host/whci/Makefile +0 -0
drivers/staging/wusbcore/host/whci/asl.c renamed from drivers/usb/host/whci/asl.c +2 -2
@@ -7,10 +7,10 @@#include <linux/kernel.h> #include <linux/gfp.h> #include <linux/dma-mapping.h> -#include <linux/uwb/umc.h> #include <linux/usb.h> -#include "../../wusbcore/wusbhc.h" +#include "../../../uwb/include/umc.h" +#include "../../wusbhc.h" #include "whcd.h"
drivers/staging/wusbcore/host/whci/debug.c renamed from drivers/usb/host/whci/debug.c +1 -1
@@ -10,7 +10,7 @@#include <linux/seq_file.h> #include <linux/export.h> -#include "../../wusbcore/wusbhc.h" +#include "../../wusbhc.h" #include "whcd.h"
drivers/staging/wusbcore/host/whci/hcd.c renamed from drivers/usb/host/whci/hcd.c +2 -2
@@ -7,9 +7,9 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/uwb/umc.h> -#include "../../wusbcore/wusbhc.h" +#include "../../../uwb/include/umc.h" +#include "../../wusbhc.h" #include "whcd.h"
drivers/staging/wusbcore/host/whci/hw.c renamed from drivers/usb/host/whci/hw.c +2 -2
@@ -6,9 +6,9 @@*/ #include <linux/kernel.h> #include <linux/dma-mapping.h> -#include <linux/uwb/umc.h> -#include "../../wusbcore/wusbhc.h" +#include "../../../uwb/include/umc.h" +#include "../../wusbhc.h" #include "whcd.h"
drivers/staging/wusbcore/host/whci/init.c renamed from drivers/usb/host/whci/init.c +2 -2
@@ -7,9 +7,9 @@#include <linux/kernel.h> #include <linux/gfp.h> #include <linux/dma-mapping.h> -#include <linux/uwb/umc.h> -#include "../../wusbcore/wusbhc.h" +#include "../../../uwb/include/umc.h" +#include "../../wusbhc.h" #include "whcd.h"
drivers/staging/wusbcore/host/whci/int.c renamed from drivers/usb/host/whci/int.c +2 -2
@@ -5,9 +5,9 @@* Copyright (C) 2007 Cambridge Silicon Radio Ltd. */ #include <linux/kernel.h> -#include <linux/uwb/umc.h> -#include "../../wusbcore/wusbhc.h" +#include "../../../uwb/include/umc.h" +#include "../../wusbhc.h" #include "whcd.h"
drivers/staging/wusbcore/host/whci/pzl.c renamed from drivers/usb/host/whci/pzl.c +2 -2
@@ -7,10 +7,10 @@#include <linux/kernel.h> #include <linux/gfp.h> #include <linux/dma-mapping.h> -#include <linux/uwb/umc.h> #include <linux/usb.h> -#include "../../wusbcore/wusbhc.h" +#include "../../../uwb/include/umc.h" +#include "../../wusbhc.h" #include "whcd.h"
drivers/staging/wusbcore/host/whci/qset.c renamed from drivers/usb/host/whci/qset.c +2 -2
@@ -7,10 +7,10 @@#include <linux/kernel.h> #include <linux/dma-mapping.h> #include <linux/slab.h> -#include <linux/uwb/umc.h> #include <linux/usb.h> -#include "../../wusbcore/wusbhc.h" +#include "../../../uwb/include/umc.h" +#include "../../wusbhc.h" #include "whcd.h"
drivers/staging/wusbcore/host/whci/whcd.h renamed from drivers/usb/host/whci/whcd.h +2 -2
@@ -7,10 +7,10 @@#ifndef __WHCD_H#define __WHCD_H -#include <linux/uwb/whci.h> -#include <linux/uwb/umc.h> #include <linux/workqueue.h> +#include "../../../uwb/include/whci.h" +#include "../../../uwb/include/umc.h" #include "whci-hc.h" /* Generic command timeout. */
drivers/staging/wusbcore/host/whci/whci-hc.h renamed from drivers/usb/host/whci/whci-hc.h +0 -0
drivers/staging/wusbcore/host/whci/wusb.c renamed from drivers/usb/host/whci/wusb.c +2 -2
@@ -5,9 +5,9 @@* Copyright (C) 2007 Cambridge Silicon Radio Ltd. */ #include <linux/kernel.h> -#include <linux/uwb/umc.h> -#include "../../wusbcore/wusbhc.h" +#include "../../../uwb/include/umc.h" +#include "../../wusbhc.h" #include "whcd.h"
drivers/staging/wusbcore/include/association.h renamed from include/linux/usb/association.h +0 -0
drivers/staging/wusbcore/include/wusb-wa.h renamed from include/linux/usb/wusb-wa.h +0 -0
drivers/staging/wusbcore/include/wusb.h renamed from include/linux/usb/wusb.h +1 -1
@@ -33,9 +33,9 @@#include <linux/types.h> #include <linux/kernel.h> -#include <linux/uwb/spec.h> #include <linux/usb/ch9.h> #include <linux/param.h> +#include "../../uwb/include/spec.h" /** * WUSB Information Element header
drivers/staging/wusbcore/mmc.c renamed from drivers/usb/wusbcore/mmc.c +1 -1
@@ -22,9 +22,9 @@* FIXME: * - add timers that autoremove intervalled IEs? */ -#include <linux/usb/wusb.h> #include <linux/slab.h> #include <linux/export.h> +#include "include/wusb.h" #include "wusbhc.h" /* Initialize the MMCIEs handling mechanism */
drivers/staging/wusbcore/pal.c renamed from drivers/usb/wusbcore/pal.c +0 -0
drivers/staging/wusbcore/reservation.c renamed from drivers/usb/wusbcore/reservation.c +1 -1
@@ -5,8 +5,8 @@* Copyright (C) 2007 Cambridge Silicon Radio Ltd. */ #include <linux/kernel.h> -#include <linux/uwb.h> +#include "../uwb/uwb.h" #include "wusbhc.h" /*
drivers/staging/wusbcore/rh.c renamed from drivers/usb/wusbcore/rh.c +0 -0
drivers/staging/wusbcore/security.c renamed from drivers/usb/wusbcore/security.c +0 -0
drivers/staging/wusbcore/wa-hc.c renamed from drivers/usb/wusbcore/wa-hc.c +0 -0
drivers/staging/wusbcore/wa-hc.h renamed from drivers/usb/wusbcore/wa-hc.h +3 -3
@@ -70,9 +70,9 @@#include <linux/usb.h> #include <linux/mutex.h> #include <linux/spinlock.h> -#include <linux/uwb.h> -#include <linux/usb/wusb.h> -#include <linux/usb/wusb-wa.h> +#include "../uwb/uwb.h" +#include "include/wusb.h" +#include "include/wusb-wa.h" struct wusbhc ;struct wahc ;
drivers/staging/wusbcore/wa-nep.c renamed from drivers/usb/wusbcore/wa-nep.c +0 -0
drivers/staging/wusbcore/wa-rpipe.c renamed from drivers/usb/wusbcore/wa-rpipe.c +0 -0
drivers/staging/wusbcore/wa-xfer.c renamed from drivers/usb/wusbcore/wa-xfer.c +0 -0
drivers/staging/wusbcore/wusbhc.c renamed from drivers/usb/wusbcore/wusbhc.c +0 -0
drivers/staging/wusbcore/wusbhc.h renamed from drivers/usb/wusbcore/wusbhc.h +2 -2
@@ -45,8 +45,8 @@#include <linux/kref.h> #include <linux/workqueue.h> #include <linux/usb/hcd.h> -#include <linux/uwb.h> -#include <linux/usb/wusb.h> +#include "../uwb/uwb.h" +#include "include/wusb.h" /* * Time from a WUSB channel stop request to the last transmitted MMC.
drivers/usb/Kconfig +0 -2
@@ -98,8 +98,6 @@ source "drivers/usb/core/Kconfig" source "drivers/usb/mon/Kconfig" -source "drivers/usb/wusbcore/Kconfig" - source "drivers/usb/host/Kconfig" source "drivers/usb/renesas_usbhs/Kconfig"
drivers/usb/Makefile +0 -2
@@ -35,8 +35,6 @@ obj-$(CONFIG_USB_MAX3421_HCD) += host/ obj-$(CONFIG_USB_C67X00_HCD) += c67x00/ -obj-$(CONFIG_USB_WUSB) += wusbcore/ - obj-$(CONFIG_USB_ACM) += class/ obj-$(CONFIG_USB_PRINTER) += class/ obj-$(CONFIG_USB_WDM) += class/
drivers/usb/host/Kconfig +0 -26
@@ -717,32 +717,6 @@ config USB_RENESAS_USBHS_HCD To compile this driver as a module, choose M here: the module will be called renesas-usbhs. -config USB_WHCI_HCD - tristate "Wireless USB Host Controller Interface (WHCI) driver" - depends on USB_PCI && USB && UWB - select USB_WUSB - select UWB_WHCI - help - A driver for PCI-based Wireless USB Host Controllers that are - compliant with the WHCI specification. - - To compile this driver a module, choose M here: the module - will be called "whci-hcd". - -config USB_HWA_HCD - tristate "Host Wire Adapter (HWA) driver" - depends on USB && UWB - select USB_WUSB - select UWB_HWA - help - This driver enables you to connect Wireless USB devices to - your system using a Host Wire Adaptor USB dongle. This is an - UWB Radio Controller and WUSB Host Controller connected to - your machine via USB (specified in WUSB1.0). - - To compile this driver a module, choose M here: the module - will be called "hwa-hc". - config USB_IMX21_HCD tristate "i.MX21 HCD support" depends on ARM && ARCH_MXC
drivers/usb/host/Makefile +0 -3
@@ -35,8 +35,6 @@ ifneq ($(CONFIG_DEBUG_FS),) xhci-hcd-y += xhci-debugfs.o endif -obj-$(CONFIG_USB_WHCI_HCD) += whci/ - obj-$(CONFIG_USB_PCI) += pci-quirks.o obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
@@ -82,7 +80,6 @@ obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o -obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_FSL_USB2) += fsl-mph-dr-of.o obj-$(CONFIG_USB_EHCI_FSL) += fsl-mph-dr-of.o
Signature · 1 line
2.22.0
Quoted 3 lines · Greg Kroah-Hartman
The UWB and wusbcore code is long obsolete, so let us just move the code out of the real part of the kernel and into the
drivers/staging/location with plans to remove it entirely in a few releases.
[]
Quoted 1 line
MAINTAINERS | 15 +++-------
[]
MAINTAINERS
Quoted 1 line
MAINTAINERS +0
-0
[]
MAINTAINERS F: scripts/sign-file.c · line 3804
Quoted 7 lines
MAINTAINERS +1
-1@@ -3800,14 +3800,9 @@ F: scripts/sign-file.c F: scripts/extract-cert.c CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: -L: [email protected] +L: [email protected] S: Orphan
Better to mark this as obsolete so checkpatch emits a message saying "no unnecessary modifications"
Greg Kroah-Hartman
maintainerQuoted 12 lines · Joe Perches
Quoted 3 lines · Greg Kroah-Hartman
The UWB and wusbcore code is long obsolete, so let us just move the code out of the real part of the kernel and into the
drivers/staging/location with plans to remove it entirely in a few releases.[]
Quoted 1 line
MAINTAINERS | 15 +++-------[]
MAINTAINERS
Quoted 1 line
MAINTAINERS +0
-0[]
Quoted 3 lines
MAINTAINERS +0
-0@@ -3800,14 +3800,9 @@ F: scripts/sign-file.c F: scripts/extract-cert.c
Quoted 9 lines
MAINTAINERS F: scripts/sign-file.c · line 3804
Quoted 4 lines
MAINTAINERS +1
-1CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: -L: [email protected] +L: [email protected] S: OrphanBetter to mark this as obsolete so checkpatch emits a message saying "no unnecessary modifications"
Ah, good point, will do that as an add-on patch after this.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 1/1 MAINTAINERS: mark wusbcore and UWB as obsolete
Joe rightly points out that we should be using the "Obsolete" status for these two subsystems.
Also I got the path name wrong for the wusbcore tree.
MAINTAINERS +3 -3
@@ -3801,8 +3801,8 @@ F: scripts/extract-cert.c CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: L: [email protected] -S: Orphan -F: drivers/staging/wbusbcore/ +S: Obsolete +F: drivers/staging/wusbcore/ CFAG12864B LCD DRIVER M: Miguel Ojeda Sandonis <[email protected]>
@@ -16443,7 +16443,7 @@ F: include/linux/ulpi/ ULTRA-WIDEBAND (UWB) SUBSYSTEM: L: [email protected] -S: Orphan +S: Obsolete F: drivers/staging/uwb/ UNICODE SUBSYSTEM:
Greg Kroah-Hartman
maintainerRe: [PATCH] MAINTAINERS: mark wusbcore and UWB as obsolete
Quoted 2 lines · Greg Kroah-Hartman
Joe rightly points out that we should be using the "Obsolete" status for these two subsystems.
Even with that change, I don't see get_maintainers.pl tell me I shouldn't be sending a patch in for this area:
$ cat x.patch
drivers/staging/uwb/Kconfig +2 -0
@@ -3,6 +3,8 @@ # UWB device configuration # + + menuconfig UWB tristate "Ultra Wideband devices" default n
$ ./scripts/get_maintainer.pl x.patch Greg Kroah-Hartman <[email protected]> (supporter:STAGING SUBSYSTEM,commit_signer:2/2=100%,authored:1/2=50%) Thomas Gleixner <[email protected]> (commit_signer:1/2=50%,authored:1/2=50%) [email protected] (open list:ULTRA-WIDEBAND (UWB) SUBSYSTEM:) [email protected] (open list)
Am I missing something?
thanks,
greg k-h
Re: [PATCH] MAINTAINERS: mark wusbcore and UWB as obsolete
Quoted 6 lines · Greg Kroah-Hartman
Quoted 2 lines · Greg Kroah-Hartman
Joe rightly points out that we should be using the "Obsolete" status for these two subsystems.
Even with that change, I don't see get_maintainers.pl tell me I shouldn't be sending a patch in for this area:
Nor should you. It's checkpatch that should warn.
Quoted 24 lines
$ cat x.patchdrivers/staging/uwb/Kconfig +2
-0@@ -3,6 +3,8 @@ # UWB device configuration # + + menuconfig UWB tristate "Ultra Wideband devices" default n$ ./scripts/get_maintainer.pl x.patch Greg Kroah-Hartman <[email protected]> (supporter:STAGING SUBSYSTEM,commit_signer:2/2=100%,authored:1/2=50%) Thomas Gleixner <[email protected]> (commit_signer:1/2=50%,authored:1/2=50%) [email protected] (open list:ULTRA-WIDEBAND (UWB) SUBSYSTEM:) [email protected] (open list)Am I missing something?
Greg Kroah-Hartman
maintainerRe: [PATCH] MAINTAINERS: mark wusbcore and UWB as obsolete
Quoted 9 lines · Joe Perches
Quoted 6 lines · Greg Kroah-Hartman
Quoted 2 lines · Greg Kroah-Hartman
Joe rightly points out that we should be using the "Obsolete" status for these two subsystems.
Even with that change, I don't see get_maintainers.pl tell me I shouldn't be sending a patch in for this area:
Nor should you. It's checkpatch that should warn.
Ah, wrong tool. Yes, it does, let's see if anyone actually notices that when sending checkpatch changes for these files in the future :)
thanks,
greg k-h
Re: [PATCH] MAINTAINERS: mark wusbcore and UWB as obsolete
Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines · Joe Perches
Quoted 4 lines · Greg Kroah-Hartman
Quoted 2 lines · Greg Kroah-Hartman
Joe rightly points out that we should be using the "Obsolete" status for these two subsystems.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Even with that change, I don't see get_maintainers.pl tell me I shouldn't be sending a patch in for this area:
Nor should you. It's checkpatch that should warn.
Ah, wrong tool. Yes, it does, let's see if anyone actually notices that when sending checkpatch changes for these files in the future :)
Maybe mark the isdn block obsolete too.