staging: Remove slicoss driver
PATCH 1/1 staging: Remove slicoss driver
There is now a different driver for the slicoss devices in drivers/net/ethernet/alacritech/. That driver supports the same PCI device IDs as the driver in staging. Both drivers use the same configuration symbol (CONFIG_SLICOSS), which causes build failures for the staging driver. Presumably the driver in staging is obsolete and can be removed.
--- MAINTAINERS | 6 - drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/slicoss/Kconfig | 14 - drivers/staging/slicoss/Makefile | 1 - drivers/staging/slicoss/README | 7 - drivers/staging/slicoss/TODO | 36 - drivers/staging/slicoss/slic.h | 573 ------- drivers/staging/slicoss/slichw.h | 652 -------- drivers/staging/slicoss/slicoss.c | 3131 ------------------------------------- 10 files changed, 4423 deletions(-) delete mode 100644 drivers/staging/slicoss/Kconfig delete mode 100644 drivers/staging/slicoss/Makefile delete mode 100644 drivers/staging/slicoss/README delete mode 100644 drivers/staging/slicoss/TODO delete mode 100644 drivers/staging/slicoss/slic.h delete mode 100644 drivers/staging/slicoss/slichw.h delete mode 100644 drivers/staging/slicoss/slicoss.c
MAINTAINERS +0 -6
@@ -11549,12 +11549,6 @@ L: [email protected] S: Maintained F: drivers/staging/sm750fb/ -STAGING - SLICOSS -M: Lior Dotan <[email protected]> -M: Christopher Harrer <[email protected]> -S: Odd Fixes -F: drivers/staging/slicoss/ - STAGING - SPEAKUP CONSOLE SPEECH DRIVER M: William Hubbs <[email protected]> M: Chris Brannon <[email protected]>
drivers/staging/Kconfig +0 -2
@@ -24,8 +24,6 @@ menuconfig STAGING if STAGING -source "drivers/staging/slicoss/Kconfig" - source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/comedi/Kconfig"
drivers/staging/Makefile +0 -1
@@ -1,7 +1,6 @@ # Makefile for staging directory obj-y += media/ -obj-$(CONFIG_SLICOSS) += slicoss/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
drivers/staging/slicoss/Kconfig deleted +0 -14
@@ -1,14 +0,0 @@ -config SLICOSS - tristate "Alacritech Gigabit IS-NIC support" - depends on PCI && X86 && NET - default n - help - This driver supports Alacritech's IS-NIC gigabit ethernet cards. - - This includes the following devices: - Mojave cards (single port PCI Gigabit) both copper and fiber - Oasis cards (single and dual port PCI-x Gigabit) copper and fiber - Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber - - To compile this driver as a module, choose M here: the module - will be called slicoss.
drivers/staging/slicoss/Makefile deleted +0 -1
@@ -1 +0,0 @@ -obj-$(CONFIG_SLICOSS) += slicoss.o
drivers/staging/slicoss/README deleted +0 -7
@@ -1,7 +0,0 @@ -This driver is supposed to support: - - Mojave cards (single port PCI Gigabit) both copper and fiber - Oasis cards (single and dual port PCI-x Gigabit) copper and fiber - Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber - -The driver was actually tested on Oasis and Kalahari cards.
drivers/staging/slicoss/TODO deleted +0 -36
@@ -1,36 +0,0 @@ -TODO: - - move firmware loading to request_firmware() - - remove direct memory access of structures - - any remaining sparse and checkpatch.pl warnings - - - use net_device_ops - - use dev->stats rather than adapter->stats - - don't cast netdev_priv it is already void - - GET RID OF MACROS - - work on all architectures - - without CONFIG_X86_64 confusion - - do 64 bit correctly - - don't depend on order of union - - get rid of ASSERT(), use BUG() instead but only where necessary - looks like most aren't really useful - - no new SIOCDEVPRIVATE ioctl allowed - - don't use module_param for configuring interrupt mitigation - use ethtool instead - - reorder code to elminate use of forward declarations - - don't keep private linked list of drivers. - - use PCI_DEVICE() - - do ethtool correctly using ethtool_ops - - NAPI? - - wasted overhead of extra stats - - state variables for things that are - easily available and shouldn't be kept in card structure, cardnum, ... - slotnumber, events, ... - - volatile == bad design => bad code - - locking too fine grained, not designed just throw more locks - at problem - -Please send patches to: - Greg Kroah-Hartman <[email protected]> -and Cc: Lior Dotan <[email protected]> and Christopher Harrer -<[email protected]> as well as they are also able to test out any -changes.
drivers/staging/slicoss/slic.h deleted +0 -573
573 lines not on this page · raw message
drivers/staging/slicoss/slichw.h deleted +0 -652
652 lines not on this page · raw message
drivers/staging/slicoss/slicoss.c deleted +0 -3131
1,690 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.5.0
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerQuoted 24 lines · Guenter Roeck
There is now a different driver for the slicoss devices in
drivers/net/ethernet/alacritech/. That driver supports the same PCI device IDs as the driver in staging. Both drivers use the same configuration symbol (CONFIG_SLICOSS), which causes build failures for the staging driver. Presumably the driver in staging is obsolete and can be removed.Cc Tobias Klauser <[email protected]>Cc David S. Miller <[email protected]>Cc Lino Sanfilippo <[email protected]>Cc Lior Dotan <[email protected]>Cc Christopher Harrer <[email protected]>Signed-off-by Guenter Roeck <[email protected]>--- MAINTAINERS | 6 - drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/slicoss/Kconfig | 14 - drivers/staging/slicoss/Makefile | 1 - drivers/staging/slicoss/README | 7 - drivers/staging/slicoss/TODO | 36 - drivers/staging/slicoss/slic.h | 573 ------- drivers/staging/slicoss/slichw.h | 652 -------- drivers/staging/slicoss/slicoss.c | 3131 -------------------------------------
Quoted 8 lines
10 files changed, 4423 deletions(-) delete mode 100644 drivers/staging/slicoss/Kconfig delete mode 100644 drivers/staging/slicoss/Makefile delete mode 100644 drivers/staging/slicoss/README delete mode 100644 drivers/staging/slicoss/TODO delete mode 100644 drivers/staging/slicoss/slic.h delete mode 100644 drivers/staging/slicoss/slichw.h delete mode 100644 drivers/staging/slicoss/slicoss.c
Odd, I already did this in my staging-next tree, which should be showing up in linux-next, correct? It's not merged into Linus's tree just yet, give me a chance to get it to him please, I've been traveling. :)
thanks,
greg k-h
Quoted 34 lines · Greg Kroah-Hartman
Quoted 24 lines · Guenter Roeck
There is now a different driver for the slicoss devices in
drivers/net/ethernet/alacritech/. That driver supports the same PCI device IDs as the driver in staging. Both drivers use the same configuration symbol (CONFIG_SLICOSS), which causes build failures for the staging driver. Presumably the driver in staging is obsolete and can be removed.Cc Tobias Klauser <[email protected]>Cc David S. Miller <[email protected]>Cc Lino Sanfilippo <[email protected]>Cc Lior Dotan <[email protected]>Cc Christopher Harrer <[email protected]>Signed-off-by Guenter Roeck <[email protected]>--- MAINTAINERS | 6 - drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/slicoss/Kconfig | 14 - drivers/staging/slicoss/Makefile | 1 - drivers/staging/slicoss/README | 7 - drivers/staging/slicoss/TODO | 36 - drivers/staging/slicoss/slic.h | 573 ------- drivers/staging/slicoss/slichw.h | 652 -------- drivers/staging/slicoss/slicoss.c | 3131 -------------------------------------Quoted 8 lines
10 files changed, 4423 deletions(-) delete mode 100644 drivers/staging/slicoss/Kconfig delete mode 100644 drivers/staging/slicoss/Makefile delete mode 100644 drivers/staging/slicoss/README delete mode 100644 drivers/staging/slicoss/TODO delete mode 100644 drivers/staging/slicoss/slic.h delete mode 100644 drivers/staging/slicoss/slichw.h delete mode 100644 drivers/staging/slicoss/slicoss.c
Quoted 4 lines
Odd, I already did this in my staging-next tree, which should be showing up in linux-next, correct? It's not merged into Linus's tree just yet, give me a chance to get it to him please, I've been traveling. :)
No problem. It was still in my copy of -next, so I thought it got lost. Guess I should have updated it ;-). Sorry for the noise.
Guenter