Skip to contentSkip to conversation

cpc-usb: Removed driver from staging tree

PATCH In review Sebastian Haas 5 participants 5 messages Sep 11, 2009 2 messages not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 cpc-usb: Removed driver from staging tree

This patch prepares replacing the staging driver cpc-usb with the new developed ems_usb CAN driver.

---

 drivers/staging/Kconfig               |    2 
 drivers/staging/Makefile              |    1 
 drivers/staging/cpc-usb/Kconfig       |    4 
 drivers/staging/cpc-usb/Makefile      |    3 
 drivers/staging/cpc-usb/TODO          |    9 
 drivers/staging/cpc-usb/cpc-usb_drv.c | 1185 ---------------------------------
 drivers/staging/cpc-usb/cpc.h         |  440 ------------
 drivers/staging/cpc-usb/cpc_int.h     |   83 --
 drivers/staging/cpc-usb/cpcusb.h      |   86 --
 drivers/staging/cpc-usb/sja2m16c.h    |   41 -
 drivers/staging/cpc-usb/sja2m16c_2.c  |  452 -------------
 11 files changed, 0 insertions(+), 2306 deletions(-)
 delete mode 100644 drivers/staging/cpc-usb/Kconfig
 delete mode 100644 drivers/staging/cpc-usb/Makefile
 delete mode 100644 drivers/staging/cpc-usb/TODO
 delete mode 100644 drivers/staging/cpc-usb/cpc-usb_drv.c
 delete mode 100644 drivers/staging/cpc-usb/cpc.h
 delete mode 100644 drivers/staging/cpc-usb/cpc_int.h
 delete mode 100644 drivers/staging/cpc-usb/cpcusb.h
 delete mode 100644 drivers/staging/cpc-usb/sja2m16c.h
 delete mode 100644 drivers/staging/cpc-usb/sja2m16c_2.c
drivers/staging/Kconfig +0 -2
index 975ecdd..5e4b865 100644
@@ -121,8 +121,6 @@ source "drivers/staging/serqt_usb2/Kconfig"
 
 source "drivers/staging/vt6655/Kconfig"
 
-source "drivers/staging/cpc-usb/Kconfig"
-
 source "drivers/staging/pata_rdc/Kconfig"
 
 source "drivers/staging/udlfb/Kconfig"
drivers/staging/Makefile +0 -1
index 2241ae1..ede1599 100644
@@ -42,6 +42,5 @@ obj-$(CONFIG_LINE6_USB)		+= line6/
 obj-$(CONFIG_USB_SERIAL_QUATECH2)	+= serqt_usb2/
 obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/
 obj-$(CONFIG_VT6655)		+= vt6655/
-obj-$(CONFIG_USB_CPC)		+= cpc-usb/
 obj-$(CONFIG_RDC_17F3101X)	+= pata_rdc/
 obj-$(CONFIG_FB_UDL)		+= udlfb/
drivers/staging/cpc-usb/Kconfig deleted +0 -4
deleted file mode 100644
index 2be0bc9..0000000
@@ -1,4 +0,0 @@
-config USB_CPC
-	tristate "CPC CAN USB driver"
-	depends on USB && PROC_FS
-	default n
drivers/staging/cpc-usb/Makefile deleted +0 -3
deleted file mode 100644
index 3f83170..0000000
@@ -1,3 +0,0 @@
-obj-$(CONFIG_USB_CPC)	+= cpc-usb.o
-
-cpc-usb-y := cpc-usb_drv.o sja2m16c_2.o
drivers/staging/cpc-usb/TODO deleted +0 -9
deleted file mode 100644
index 000e8bb..0000000
@@ -1,9 +0,0 @@
-Things to do for this driver to get merged into the main portion of the
-kernel:
-	- checkpatch cleanups
-	- sparse clean
-	- remove proc code
-	- tie into CAN socket interfaces if possible
-	- figure out sane userspace api
-
-Send patches to Greg Kroah-Hartman <[email protected]>
drivers/staging/cpc-usb/cpc-usb_drv.c deleted +0 -1185

1,185 lines not on this page · raw message

drivers/staging/cpc-usb/cpc.h deleted +0 -440

440 lines not on this page · raw message

drivers/staging/cpc-usb/cpc_int.h deleted +0 -83

83 lines not on this page · raw message

drivers/staging/cpc-usb/cpcusb.h deleted +0 -86

86 lines not on this page · raw message

drivers/staging/cpc-usb/sja2m16c.h deleted +0 -41

41 lines not on this page · raw message

drivers/staging/cpc-usb/sja2m16c_2.c deleted +0 -452

452 lines not on this page · raw message

Signature · 7 lines
EMS Dr. Thomas Wuensche e.K.
Sonnenhang 3
85304 Ilmmuenster
HRA Neuburg a.d. Donau, HR-Nr. 70.106
Phone: +49-8441-490260
Fax  : +49-8441-81860
http://www.ems-wuensche.com

A message that is not in the archive (sent off-list or not yet received): 20090911105449.7815.65368.stgit-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]

#2 lore raw

PATCH 2/2 ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface

This patch adds support for one channel CAN/USB interace CPC-USB/ARM7 from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.com).

---

 drivers/net/can/Kconfig   |    7 
 drivers/net/can/Makefile  |    2 
 drivers/net/can/ems_usb.c | 1138 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1147 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/can/ems_usb.c
drivers/net/can/Kconfig +7 -0
index 0900743..6ac5aa5 100644
@@ -75,6 +75,13 @@ config CAN_EMS_PCI
 	  CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
 	  (http://www.ems-wuensche.de).
 
+config CAN_EMS_USB
+	tristate "EMS CPC-USB/ARM7 CAN/USB interface"
+	depends on USB && CAN_DEV
+	---help---
+	  This driver is for the one channel CPC-USB/ARM7 CAN/USB interface
+	  from from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
+
 config CAN_KVASER_PCI
 	tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
 	depends on PCI && CAN_SJA1000
drivers/net/can/Makefile +2 -0
index 523a941..676a606 100644
@@ -7,6 +7,8 @@ obj-$(CONFIG_CAN_VCAN)		+= vcan.o
 obj-$(CONFIG_CAN_DEV)		+= can-dev.o
 can-dev-y			:= dev.o
 
+obj-$(CONFIG_CAN_EMS_USB)	+= ems_usb.o
+
 obj-$(CONFIG_CAN_SJA1000)	+= sja1000/
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
drivers/net/can/ems_usb.c new file +1138 -0

1,138 lines not on this page · raw message

Signature · 7 lines
EMS Dr. Thomas Wuensche e.K.
Sonnenhang 3
85304 Ilmmuenster
HRA Neuburg a.d. Donau, HR-Nr. 70.106
Phone: +49-8441-490260
Fax  : +49-8441-81860
http://www.ems-wuensche.com

A message that is not in the archive (sent off-list or not yet received): 20090911105455.7815.12354.stgit-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]

#4 lore raw

Re: [PATCH 2/2] ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface

Hi Sebastian,

Quoted 4 lines · Sebastian Haas

This patch adds support for one channel CAN/USB interace CPC-USB/ARM7 from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.com).

we reviewed the driver already on the Socket-CAN ML and it's OK from the Socket-CAN point of view. I will do a quick (re-)check beginning of next week. I would be nice to have this patch also reviewed by some Linux USB experts. Therefore I suggest sending it to the relevant Linux-USB mailing list as well.

Wolfgang.

#5 lore raw

Re: [PATCH 2/2] ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface

Quoted 10 lines · Wolfgang Grandegger

Hi Sebastian,

Quoted 4 lines · Sebastian Haas

This patch adds support for one channel CAN/USB interace CPC-USB/ARM7 from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.com).

we reviewed the driver already on the Socket-CAN ML and it's OK from the Socket-CAN point of view.

Ack.

Quoted 4 lines

I will do a quick (re-)check beginning of next
week. I would be nice to have this patch also reviewed by some Linux USB experts. Therefore I suggest sending it to the relevant Linux-USB mailing list as well.

When there is feedback that would cause any changes (and a second posting), i would suggest to put the driver under

drivers/net/can/usb/ems_usb.c

Regards,
Oliver