[Patch v4] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc

[Patch v4] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc

[Rene Buergel]

This patch moves drivers/usb/serial/ezusb.c to drivers/usb/misc/and
adapts Makefiles and Kconfigs switching from bool to tristate for CONFIG_USB_EZUSB

Signed-off-by: René Bürgel <rene.buergel@sohard.de>
---
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 1bfcd02..1c63b54 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -244,3 +244,7 @@ config USB_YUREX
 	  To compile this driver as a module, choose M here: the
 	  module will be called yurex.
 
+config USB_EZUSB
+	tristate "Functions for loading firmware on EZUSB chips"
+	help
+	    Say Y here if you need EZUSB device support.
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 796ce7e..f1f7815 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_USB_CYPRESS_CY7C63)	+= cypress_cy7c63.o
 obj-$(CONFIG_USB_CYTHERM)		+= cytherm.o
 obj-$(CONFIG_USB_EMI26)			+= emi26.o
 obj-$(CONFIG_USB_EMI62)			+= emi62.o
+obj-$(CONFIG_USB_EZUSB)			+= ezusb.o
 obj-$(CONFIG_USB_FTDI_ELAN)		+= ftdi-elan.o
 obj-$(CONFIG_USB_IDMOUSE)		+= idmouse.o
 obj-$(CONFIG_USB_IOWARRIOR)		+= iowarrior.o
diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/misc/ezusb.c
similarity index 100%
rename from drivers/usb/serial/ezusb.c
rename to drivers/usb/misc/ezusb.c
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 325d291..73b5e6f 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -42,11 +42,6 @@ config USB_SERIAL_CONSOLE
 
 	  If unsure, say N.
 
-config USB_EZUSB
-	bool "Functions for loading firmware on EZUSB chips"
-	help
-	    Say Y here if you need EZUSB device support.
-
 config USB_SERIAL_GENERIC
 	bool "USB Generic Serial Driver"
 	help
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 1dc483a..12b56bb 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_USB_SERIAL)			+= usbserial.o
 usbserial-y := usb-serial.o generic.o bus.o
 
 usbserial-$(CONFIG_USB_SERIAL_CONSOLE)	+= console.o
-usbserial-$(CONFIG_USB_EZUSB)		+= ezusb.o
 
 obj-$(CONFIG_USB_SERIAL_AIRCABLE)		+= aircable.o
 obj-$(CONFIG_USB_SERIAL_ARK3116)		+= ark3116.o

Re: [Patch v4] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc

[Greg KH]

[-- Attachment #1: Type: text/plain, Size: 1019 bytes --]

On Wed, Sep 19, 2012 at 11:40:07PM +0200, Rene Buergel wrote:
> This patch moves drivers/usb/serial/ezusb.c to drivers/usb/misc/and
> adapts Makefiles and Kconfigs switching from bool to tristate for CONFIG_USB_EZUSB
> 
> Signed-off-by: René Bürgel <rene.buergel@sohard.de>

Ok, I get the same problem as I reported before:

ERROR: "ezusb_fx1_ihex_firmware_download" [drivers/usb/serial/whiteheat.ko] undefined!
ERROR: "ezusb_fx1_ihex_firmware_download" [drivers/usb/serial/keyspan_pda.ko] undefined!
ERROR: "ezusb_fx1_set_reset" [drivers/usb/serial/keyspan_pda.ko] undefined!
ERROR: "ezusb_fx1_ihex_firmware_download" [drivers/usb/serial/keyspan.ko] undefined!

What I did was:
  - build the kernel without this patch.
  - apply the patch
  - run make to build the kernel again.

Something isn't getting rebuilt properly, and this is going to hit lots
of other kernel developers, so I can't take this as-is.

I've attached my .config file below, maybe something there can help with
figuring it out?

thanks,

greg k-h

[-- Attachment #2: .config --]
[-- Type: application/x-config, Size: 94221 bytes --]

Re: [Patch v4] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc

[Rene Buergel]

> ERROR: "ezusb_fx1_ihex_firmware_download"
> [drivers/usb/serial/whiteheat.ko] undefined!
> ERROR: "ezusb_fx1_ihex_firmware_download"
> [drivers/usb/serial/keyspan_pda.ko] undefined!
> ERROR: "ezusb_fx1_set_reset" [drivers/usb/serial/keyspan_pda.ko]
> undefined!
> ERROR: "ezusb_fx1_ihex_firmware_download"
> [drivers/usb/serial/keyspan.ko] undefined!
> 
> What I did was:
>   - build the kernel without this patch.
>   - apply the patch
>   - run make to build the kernel again.
> 
> Something isn't getting rebuilt properly, and this is going to hit
> lots of other kernel developers, so I can't take this as-is.
> 
> I've attached my .config file below, maybe something there can help
> with figuring it out?

thanks!

i managed to reproduce the error with your config.
I'm still trying to figure out why my config worked fine and how to fix this...

This might take me a while.


René Bürgel