Commit 0a2b8a0d authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman
Browse files

usb: makefile cleanup 



For all modules, change <module>-objs to <module>-y; remove
if-statements and replace with lists using the kbuild idiom; move
flags to the top of the file; and fix alignment while trying to
maintain the original scheme in each file.

None of the dependencies are modified.

Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 75d87cdf

drivers/usb/atm/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -2,10 +2,10 @@ 
# Makefile for USB ATM/xDSL drivers

# Makefile for USB ATM/xDSL drivers

#

#





ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG



obj-$(CONFIG_USB_CXACRU)	+= cxacru.o

obj-$(CONFIG_USB_CXACRU)	+= cxacru.o

obj-$(CONFIG_USB_SPEEDTOUCH)	+= speedtch.o

obj-$(CONFIG_USB_SPEEDTOUCH)	+= speedtch.o

obj-$(CONFIG_USB_UEAGLEATM)	+= ueagle-atm.o

obj-$(CONFIG_USB_UEAGLEATM)	+= ueagle-atm.o

obj-$(CONFIG_USB_ATM)		+= usbatm.o

obj-$(CONFIG_USB_ATM)		+= usbatm.o

obj-$(CONFIG_USB_XUSBATM)	+= xusbatm.o
 
obj-$(CONFIG_USB_XUSBATM)	+= xusbatm.o
 


ccflags-$(CONFIG_USB_DEBUG)	:= -DDEBUG

drivers/usb/c67x00/Makefile

+3 −3
Original line number Original line Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Makefile for Cypress C67X00 USB Controller

# Makefile for Cypress C67X00 USB Controller

#

#





ccflags-$(CONFIG_USB_DEBUG)		+= -DDEBUG

ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG





obj-$(CONFIG_USB_C67X00_HCD)	+= c67x00.o

obj-$(CONFIG_USB_C67X00_HCD)	+= c67x00.o





c67x00-objs := c67x00-drv.o c67x00-ll-hpi.o c67x00-hcd.o c67x00-sched.o
 
c67x00-y := c67x00-drv.o c67x00-ll-hpi.o c67x00-hcd.o c67x00-sched.o

drivers/usb/core/Makefile

+7 −12
Original line number Original line Diff line number Diff line
@@ -2,18 +2,13 @@ 
# Makefile for USB Core files and filesystem

# Makefile for USB Core files and filesystem

#

#





usbcore-objs	:= usb.o hub.o hcd.o urb.o message.o driver.o \

ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG

			config.o file.o buffer.o sysfs.o endpoint.o \

			devio.o notify.o generic.o quirks.o devices.o





ifeq ($(CONFIG_PCI),y)

usbcore-y := usb.o hub.o hcd.o urb.o message.o driver.o

	usbcore-objs	+= hcd-pci.o

usbcore-y += config.o file.o buffer.o sysfs.o endpoint.o

endif

usbcore-y += devio.o notify.o generic.o quirks.o devices.o





ifeq ($(CONFIG_USB_DEVICEFS),y)

usbcore-$(CONFIG_PCI)		+= hcd-pci.o

	usbcore-objs	+= inode.o

usbcore-$(CONFIG_USB_DEVICEFS)	+= inode.o

endif





obj-$(CONFIG_USB)		+= usbcore.o
 
obj-$(CONFIG_USB)		+= usbcore.o
 


ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG

drivers/usb/gadget/Makefile

+18 −21
Original line number Original line Diff line number Diff line
@@ -16,10 +16,8 @@ obj-$(CONFIG_USB_S3C2410) += s3c2410_udc.o 
obj-$(CONFIG_USB_AT91)		+= at91_udc.o

obj-$(CONFIG_USB_AT91)		+= at91_udc.o

obj-$(CONFIG_USB_ATMEL_USBA)	+= atmel_usba_udc.o

obj-$(CONFIG_USB_ATMEL_USBA)	+= atmel_usba_udc.o

obj-$(CONFIG_USB_FSL_USB2)	+= fsl_usb2_udc.o

obj-$(CONFIG_USB_FSL_USB2)	+= fsl_usb2_udc.o

fsl_usb2_udc-objs		:= fsl_udc_core.o

fsl_usb2_udc-y			:= fsl_udc_core.o

ifeq ($(CONFIG_ARCH_MXC),y)

fsl_usb2_udc-$(CONFIG_ARCH_MXC)	+= fsl_mxc_udc.o

fsl_usb2_udc-objs		+= fsl_mxc_udc.o

endif

obj-$(CONFIG_USB_M66592)	+= m66592-udc.o

obj-$(CONFIG_USB_M66592)	+= m66592-udc.o

obj-$(CONFIG_USB_R8A66597)	+= r8a66597-udc.o

obj-$(CONFIG_USB_R8A66597)	+= r8a66597-udc.o

obj-$(CONFIG_USB_FSL_QE)	+= fsl_qe_udc.o

obj-$(CONFIG_USB_FSL_QE)	+= fsl_qe_udc.o
@@ -30,21 +28,21 @@ obj-$(CONFIG_USB_LANGWELL) += langwell_udc.o 
#

#

# USB gadget drivers

# USB gadget drivers

#

#

g_zero-objs			:= zero.o

g_zero-y			:= zero.o

g_audio-objs			:= audio.o

g_audio-y			:= audio.o

g_ether-objs			:= ether.o

g_ether-y			:= ether.o

g_serial-objs			:= serial.o

g_serial-y			:= serial.o

g_midi-objs			:= gmidi.o

g_midi-y			:= gmidi.o

gadgetfs-objs			:= inode.o

gadgetfs-y			:= inode.o

g_file_storage-objs		:= file_storage.o

g_file_storage-y		:= file_storage.o

g_mass_storage-objs		:= mass_storage.o

g_mass_storage-y		:= mass_storage.o

g_printer-objs			:= printer.o

g_printer-y			:= printer.o

g_cdc-objs			:= cdc2.o

g_cdc-y				:= cdc2.o

g_multi-objs			:= multi.o

g_multi-y			:= multi.o

g_hid-objs			:= hid.o

g_hid-y				:= hid.o

g_dbgp-objs			:= dbgp.o

g_dbgp-y			:= dbgp.o

g_nokia-objs			:= nokia.o

g_nokia-y			:= nokia.o

g_webcam-objs			:= webcam.o

g_webcam-y			:= webcam.o





obj-$(CONFIG_USB_ZERO)		+= g_zero.o

obj-$(CONFIG_USB_ZERO)		+= g_zero.o

obj-$(CONFIG_USB_AUDIO)		+= g_audio.o

obj-$(CONFIG_USB_AUDIO)		+= g_audio.o
@@ -62,4 +60,3 @@ obj-$(CONFIG_USB_G_DBGP) += g_dbgp.o 
obj-$(CONFIG_USB_G_MULTI)	+= g_multi.o

obj-$(CONFIG_USB_G_MULTI)	+= g_multi.o

obj-$(CONFIG_USB_G_NOKIA)	+= g_nokia.o

obj-$(CONFIG_USB_G_NOKIA)	+= g_nokia.o

obj-$(CONFIG_USB_G_WEBCAM)	+= g_webcam.o
 
obj-$(CONFIG_USB_G_WEBCAM)	+= g_webcam.o

drivers/usb/host/Makefile

+10 −9
Original line number Original line Diff line number Diff line
@@ -4,13 +4,15 @@ 




ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG

ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG





isp1760-objs := isp1760-hcd.o isp1760-if.o

isp1760-y := isp1760-hcd.o isp1760-if.o

fhci-objs := fhci-hcd.o fhci-hub.o fhci-q.o fhci-mem.o \



	     fhci-tds.o fhci-sched.o

fhci-y := fhci-hcd.o fhci-hub.o fhci-q.o

ifeq ($(CONFIG_FHCI_DEBUG),y)

fhci-y += fhci-mem.o fhci-tds.o fhci-sched.o

fhci-objs += fhci-dbg.o



endif

fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o

xhci-hcd-objs := xhci.o xhci-mem.o xhci-pci.o xhci-ring.o xhci-hub.o xhci-dbg.o



xhci-hcd-y := xhci.o xhci-mem.o xhci-pci.o

xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o





obj-$(CONFIG_USB_WHCI_HCD)	+= whci/

obj-$(CONFIG_USB_WHCI_HCD)	+= whci/
@@ -32,4 +34,3 @@ obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o 
obj-$(CONFIG_USB_HWA_HCD)	+= hwa-hc.o

obj-$(CONFIG_USB_HWA_HCD)	+= hwa-hc.o

obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd.o

obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd.o

obj-$(CONFIG_USB_FSL_MPH_DR_OF)	+= fsl-mph-dr-of.o
 
obj-$(CONFIG_USB_FSL_MPH_DR_OF)	+= fsl-mph-dr-of.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE