prism54: move to staging

PATCH In review Luis R. Rodriguez 2 participants 4 messages Aug 7, 2017 – Aug 17, 2017

Subsystems (2)

Staging P54 wireless driver

lore

Share & tools

lore

Luis R. Rodriguez

author

2017-08-07 22:30 UTC #0 lore raw

v2 cover prism54: move to staging

Greg,

This v2 adds the TODO you requested to clarify prism54 will be removed in two kernel releases from now, and so no further cleanup is needed other than to ensure the driver compiles.

This is based on linux-next tag next-20170807.

Luis

Luis R. Rodriguez (2):
wireless: move prism54 out to staging
MAINTAINERS: update email address for mcgrof for few straggling
drivers

Luis

 MAINTAINERS                                          |  8 ++++----
 drivers/net/wireless/intersil/Kconfig                | 20 --------------------
 drivers/net/wireless/intersil/Makefile               |  1 -
 drivers/staging/Kconfig                              |  2 ++
 drivers/staging/Makefile                             |  1 +
 .../wireless/intersil => staging}/prism54/Makefile   |  0
 drivers/staging/prism54/TODO                         |  5 +++++
 .../wireless/intersil => staging}/prism54/isl_38xx.c |  0
 .../wireless/intersil => staging}/prism54/isl_38xx.h |  0
 .../intersil => staging}/prism54/isl_ioctl.c         |  0
 .../intersil => staging}/prism54/isl_ioctl.h         |  0
 .../wireless/intersil => staging}/prism54/isl_oid.h  |  0
 .../intersil => staging}/prism54/islpci_dev.c        |  0
 .../intersil => staging}/prism54/islpci_dev.h        |  0
 .../intersil => staging}/prism54/islpci_eth.c        |  0
 .../intersil => staging}/prism54/islpci_eth.h        |  0
 .../intersil => staging}/prism54/islpci_hotplug.c    |  0
 .../intersil => staging}/prism54/islpci_mgt.c        |  0
 .../intersil => staging}/prism54/islpci_mgt.h        |  0
 .../wireless/intersil => staging}/prism54/oid_mgt.c  |  0
 .../wireless/intersil => staging}/prism54/oid_mgt.h  |  0
 .../intersil => staging}/prism54/prismcompat.h       |  0
 22 files changed, 12 insertions(+), 25 deletions(-)
 rename drivers/{net/wireless/intersil => staging}/prism54/Makefile (100%)
 create mode 100644 drivers/staging/prism54/TODO
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_38xx.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_38xx.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_ioctl.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_ioctl.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_oid.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_dev.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_dev.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_eth.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_eth.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_hotplug.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_mgt.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_mgt.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/oid_mgt.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/oid_mgt.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/prismcompat.h (100%)

Signature · 1 line

2.11.0

Luis R. Rodriguez

author

2017-08-07 22:30 UTC #1 lore raw

PATCH v2 1/2 wireless: move prism54 out to staging

prism54 is deprecated in favor of the p54pci device driver. Although only *one soul* had reported issues with it long ago Linux most Linux distributions these days just disable the device driver given the conflicts with the PCI IDs of p54pci and the *very* unlikely situation of folks really need this driver anymore.

Before trying to due away with prism54 once more stuff it into staging, which is our hospice for dying drivers.

Acked-by Kalle Valo <[email protected]>

Signed-off-by Luis R. Rodriguez <[email protected]>

---
 MAINTAINERS                                          |  4 ++--
 drivers/net/wireless/intersil/Kconfig                | 20 --------------------
 drivers/net/wireless/intersil/Makefile               |  1 -
 drivers/staging/Kconfig                              |  2 ++
 drivers/staging/Makefile                             |  1 +
 .../wireless/intersil => staging}/prism54/Makefile   |  0
 drivers/staging/prism54/TODO                         |  5 +++++
 .../wireless/intersil => staging}/prism54/isl_38xx.c |  0
 .../wireless/intersil => staging}/prism54/isl_38xx.h |  0
 .../intersil => staging}/prism54/isl_ioctl.c         |  0
 .../intersil => staging}/prism54/isl_ioctl.h         |  0
 .../wireless/intersil => staging}/prism54/isl_oid.h  |  0
 .../intersil => staging}/prism54/islpci_dev.c        |  0
 .../intersil => staging}/prism54/islpci_dev.h        |  0
 .../intersil => staging}/prism54/islpci_eth.c        |  0
 .../intersil => staging}/prism54/islpci_eth.h        |  0
 .../intersil => staging}/prism54/islpci_hotplug.c    |  0
 .../intersil => staging}/prism54/islpci_mgt.c        |  0
 .../intersil => staging}/prism54/islpci_mgt.h        |  0
 .../wireless/intersil => staging}/prism54/oid_mgt.c  |  0
 .../wireless/intersil => staging}/prism54/oid_mgt.h  |  0
 .../intersil => staging}/prism54/prismcompat.h       |  0
 22 files changed, 10 insertions(+), 23 deletions(-)
 rename drivers/{net/wireless/intersil => staging}/prism54/Makefile (100%)
 create mode 100644 drivers/staging/prism54/TODO
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_38xx.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_38xx.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_ioctl.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_ioctl.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/isl_oid.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_dev.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_dev.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_eth.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_eth.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_hotplug.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_mgt.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/islpci_mgt.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/oid_mgt.c (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/oid_mgt.h (100%)
 rename drivers/{net/wireless/intersil => staging}/prism54/prismcompat.h (100%)

MAINTAINERS +2 -2

index 672b5d5402f0..3deaddc8c578 100644
@@ -10674,11 +10674,11 @@ F:	kernel/printk/
 F:	include/linux/printk.h
 
 PRISM54 WIRELESS DRIVER
-M:	"Luis R. Rodriguez" <[email protected]>
+M:	"Luis R. Rodriguez" <[email protected]>
 L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/p54
 S:	Obsolete
-F:	drivers/net/wireless/intersil/prism54/
+F:	drivers/staging/prism54/
 
 PROC SYSCTL
 M:	"Luis R. Rodriguez" <[email protected]>

drivers/net/wireless/intersil/Kconfig +0 ~~-20~~

index 9da136049955..2b056b6daef8 100644
@@ -15,24 +15,4 @@ source "drivers/net/wireless/intersil/hostap/Kconfig"
 source "drivers/net/wireless/intersil/orinoco/Kconfig"
 source "drivers/net/wireless/intersil/p54/Kconfig"
 
-config PRISM54
-	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'
-	depends on PCI
-	select WIRELESS_EXT
-	select WEXT_SPY
-	select WEXT_PRIV
-	select FW_LOADER
-	---help---
-	  This enables support for FullMAC PCI/Cardbus prism54 devices. This
-	  driver is now deprecated in favor for the SoftMAC driver, p54pci.
-	  p54pci supports FullMAC PCI/Cardbus devices as well.
-
-	  For more information refer to the p54 wiki:
-
-	  http://wireless.kernel.org/en/users/Drivers/p54
-
-	  Note: You need a motherboard with DMA support to use any of these cards
-
-	  When built as module you get the module prism54
-
 endif # WLAN_VENDOR_INTERSIL

drivers/net/wireless/intersil/Makefile +0 -1

index 9a8cbfee3ea5..aedb713da746 100644
@@ -1,4 +1,3 @@
 obj-$(CONFIG_HOSTAP)		+= hostap/
 obj-$(CONFIG_HERMES)		+= orinoco/
 obj-$(CONFIG_P54_COMMON)	+= p54/
-obj-$(CONFIG_PRISM54)		+= prism54/

drivers/staging/Kconfig +2 -0

index e97d72e3bc40..ba13b07286c7 100644
@@ -114,4 +114,6 @@ source "drivers/staging/vboxvideo/Kconfig"
 
 source "drivers/staging/pi433/Kconfig"
 
+source "drivers/staging/prism54/Kconfig"
+
 endif # STAGING

drivers/staging/Makefile +1 -0

index 993ed0c1556c..d1be7b326e8c 100644
@@ -46,3 +46,4 @@ obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/
 obj-$(CONFIG_CRYPTO_DEV_CCREE)	+= ccree/
 obj-$(CONFIG_DRM_VBOXVIDEO)	+= vboxvideo/
 obj-$(CONFIG_PI433)		+= pi433/
+obj-$(CONFIG_PRISM54)		+= prism54/

drivers/staging/prism54/Makefile renamed from drivers/net/wireless/intersil/prism54/Makefile +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/Makefile
rename to drivers/staging/prism54/Makefile

drivers/staging/prism54/TODO new file +5 -0

new file mode 100644
index 000000000000..8286674d1d44
@@ -0,0 +1,5 @@
+prism54 TODO
+
+This driver has been deprecated in favor of p54pci, in a couple of kernel
+releases this driver will be removed, as such no further love should be given
+to this driver other than to ensure it compiles.

drivers/staging/prism54/isl_38xx.c renamed from drivers/net/wireless/intersil/prism54/isl_38xx.c +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/isl_38xx.c
rename to drivers/staging/prism54/isl_38xx.c

drivers/staging/prism54/isl_38xx.h renamed from drivers/net/wireless/intersil/prism54/isl_38xx.h +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/isl_38xx.h
rename to drivers/staging/prism54/isl_38xx.h

drivers/staging/prism54/isl_ioctl.c renamed from drivers/net/wireless/intersil/prism54/isl_ioctl.c +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/isl_ioctl.c
rename to drivers/staging/prism54/isl_ioctl.c

drivers/staging/prism54/isl_ioctl.h renamed from drivers/net/wireless/intersil/prism54/isl_ioctl.h +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/isl_ioctl.h
rename to drivers/staging/prism54/isl_ioctl.h

drivers/staging/prism54/isl_oid.h renamed from drivers/net/wireless/intersil/prism54/isl_oid.h +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/isl_oid.h
rename to drivers/staging/prism54/isl_oid.h

drivers/staging/prism54/islpci_dev.c renamed from drivers/net/wireless/intersil/prism54/islpci_dev.c +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/islpci_dev.c
rename to drivers/staging/prism54/islpci_dev.c

drivers/staging/prism54/islpci_dev.h renamed from drivers/net/wireless/intersil/prism54/islpci_dev.h +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/islpci_dev.h
rename to drivers/staging/prism54/islpci_dev.h

drivers/staging/prism54/islpci_eth.c renamed from drivers/net/wireless/intersil/prism54/islpci_eth.c +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/islpci_eth.c
rename to drivers/staging/prism54/islpci_eth.c

drivers/staging/prism54/islpci_eth.h renamed from drivers/net/wireless/intersil/prism54/islpci_eth.h +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/islpci_eth.h
rename to drivers/staging/prism54/islpci_eth.h

drivers/staging/prism54/islpci_hotplug.c renamed from drivers/net/wireless/intersil/prism54/islpci_hotplug.c +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/islpci_hotplug.c
rename to drivers/staging/prism54/islpci_hotplug.c

drivers/staging/prism54/islpci_mgt.c renamed from drivers/net/wireless/intersil/prism54/islpci_mgt.c +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/islpci_mgt.c
rename to drivers/staging/prism54/islpci_mgt.c

drivers/staging/prism54/islpci_mgt.h renamed from drivers/net/wireless/intersil/prism54/islpci_mgt.h +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/islpci_mgt.h
rename to drivers/staging/prism54/islpci_mgt.h

drivers/staging/prism54/oid_mgt.c renamed from drivers/net/wireless/intersil/prism54/oid_mgt.c +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/oid_mgt.c
rename to drivers/staging/prism54/oid_mgt.c

drivers/staging/prism54/oid_mgt.h renamed from drivers/net/wireless/intersil/prism54/oid_mgt.h +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/oid_mgt.h
rename to drivers/staging/prism54/oid_mgt.h

drivers/staging/prism54/prismcompat.h renamed from drivers/net/wireless/intersil/prism54/prismcompat.h +0 -0

similarity index 100%
rename from drivers/net/wireless/intersil/prism54/prismcompat.h
rename to drivers/staging/prism54/prismcompat.h

Signature · 1 line

2.11.0

Greg KH

maintainer

2017-08-17 16:55 UTC #2 lore raw

Re: [PATCH v2 1/2] wireless: move prism54 out to staging

Quoted 11 lines · Luis R. Rodriguez

prism54 is deprecated in favor of the p54pci device driver. Although only *one soul* had reported issues with it long ago Linux most Linux distributions these days just disable the device driver given the conflicts with the PCI IDs of p54pci and the *very* unlikely situation of folks really need this driver anymore.
Before trying to due away with prism54 once more stuff it into staging, which is our hospice for dying drivers.
Acked-by Kalle Valo <[email protected]>
Signed-off-by Luis R. Rodriguez <[email protected]>

Did you build this?

I get the following error:

drivers/staging/Kconfig:117: can't open file "drivers/staging/prism54/Kconfig"

Can you fix this and _test it_ and resend it?

thanks,

greg k-h

Luis R. Rodriguez

author

2017-08-07 22:30 UTC #3 lore raw

PATCH v2 2/2 MAINTAINERS: update email address for mcgrof for few straggling drivers

In reply to Luis R. Rodriguez

This will ensure I get emails on my work and personal email address.

Signed-off-by Luis R. Rodriguez <[email protected]>

---
 MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

MAINTAINERS +2 -2

index 3deaddc8c578..997b8062397a 100644
@@ -2212,7 +2212,7 @@ F:	drivers/gpio/gpio-ath79.c
 F:	Documentation/devicetree/bindings/gpio/gpio-ath79.txt
 
 ATHEROS ATH GENERIC UTILITIES
-M:	"Luis R. Rodriguez" <[email protected]>
+M:	"Luis R. Rodriguez" <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/net/wireless/ath/*

@@ -2220,7 +2220,7 @@ F:	drivers/net/wireless/ath/*
 ATHEROS ATH5K WIRELESS DRIVER
 M:	Jiri Slaby <[email protected]>
 M:	Nick Kossifidis <[email protected]>
-M:	"Luis R. Rodriguez" <[email protected]>
+M:	"Luis R. Rodriguez" <[email protected]>
 L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/ath5k
 S:	Maintained

Signature · 1 line

2.11.0