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: matt mooney <mfm@muteddisk.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
index 65dbf652487e..fcf14cdc4a04 100644
--- a/drivers/usb/storage/Makefile
+++ b/drivers/usb/storage/Makefile
@@ -5,21 +5,21 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-ccflags-y       := -Idrivers/scsi
+ccflags-y := -Idrivers/scsi
 
 obj-$(CONFIG_USB_UAS)           += uas.o
 obj-$(CONFIG_USB_STORAGE)       += usb-storage.o
 
-usb-storage-obj-$(CONFIG_USB_STORAGE_DEBUG)     += debug.o
+usb-storage-y := scsiglue.o protocol.o transport.o usb.o
+usb-storage-y += initializers.o sierra_ms.o option_ms.o
 
-usb-storage-objs :=     scsiglue.o protocol.o transport.o usb.o \
-                        initializers.o sierra_ms.o option_ms.o $(usb-storage-obj-y)
+usb-storage-$(CONFIG_USB_STORAGE_DEBUG) += debug.o
 
 ifeq ($(CONFIG_USB_LIBUSUAL),)
-        usb-storage-objs        += usual-tables.o
+        usb-storage-y           += usual-tables.o
 else
         obj-$(CONFIG_USB)       += usb-libusual.o
-        usb-libusual-objs       := libusual.o usual-tables.o
+        usb-libusual-y          := libusual.o usual-tables.o
 endif
 
 obj-$(CONFIG_USB_STORAGE_ALAUDA)        += ums-alauda.o
@@ -34,14 +34,14 @@ obj-$(CONFIG_USB_STORAGE_SDDR09)	+= ums-sddr09.o
 obj-$(CONFIG_USB_STORAGE_SDDR55)        += ums-sddr55.o
 obj-$(CONFIG_USB_STORAGE_USBAT)         += ums-usbat.o
 
-ums-alauda-objs         := alauda.o
-ums-cypress-objs        := cypress_atacb.o
-ums-datafab-objs        := datafab.o
-ums-freecom-objs        := freecom.o
-ums-isd200-objs         := isd200.o
-ums-jumpshot-objs       := jumpshot.o
-ums-karma-objs          := karma.o
-ums-onetouch-objs       := onetouch.o
-ums-sddr09-objs         := sddr09.o
-ums-sddr55-objs         := sddr55.o
-ums-usbat-objs          := shuttle_usbat.o
+ums-alauda-y            := alauda.o
+ums-cypress-y           := cypress_atacb.o
+ums-datafab-y           := datafab.o
+ums-freecom-y           := freecom.o
+ums-isd200-y            := isd200.o
+ums-jumpshot-y          := jumpshot.o
+ums-karma-y             := karma.o
+ums-onetouch-y          := onetouch.o
+ums-sddr09-y            := sddr09.o
+ums-sddr55-y            := sddr55.o
+ums-usbat-y             := shuttle_usbat.o