From: Michal Nazarewicz <mina86@xxxxxxxxxx> >> Matthew Wilcox <willy@xxxxxxxxxxxxxxx> writes: >>> The only thing is that I like your names better than I like the libusual >>> names. I didn't change the libusual names because I didn't want to make >>> a big patch. So instead of this patch, could we add your names to the >>> usb/storage.h header file, and then convert libusual to use your names? > On Wed, Sep 29, 2010 at 12:31:31PM +0200, Michal Nazarewicz wrote: >> This commit changes prefix for USB mass storage class >> related macros (ie. USB_SC_ for subclass and USB_PR_ for >> class). >> Done with: >> >> find -name '*.[ch]' -exec \ >> perl -i -pe 's/\bUS_(SC|PR)_/USB_${1}_/g' {} + Greg KH <greg@xxxxxxxxx> writes: > I think it might be better to do this by hand, as it broke the build > when applied I redid the patches and tested on next-20101006. I did that by first reverting the "old" patches: USB: Move USB Storage definitions to their own header file USB: Add UAS driver USB: gadget: file_storage: reuse definitions from a header file and applying attached patches. I've successfully compiled it with allmodconfig for x86. I've also successfully built and tested file_storage and mass_storage gadgets on 2.6.35 on ARM. Matthew Wilcox (2): USB: Move USB Storage definitions to their own header file USB: Add UAS driver Michal Nazarewicz (2): USB: storage: Use USB_ prefix instead of US_ prefix USB: gadget: file_storage: reuse definitions from a header file MAINTAINERS | 8 + drivers/block/ub.c | 2 +- drivers/staging/keucr/scsiglue.c | 6 +- drivers/staging/keucr/transport.c | 4 +- drivers/staging/keucr/usb.c | 8 +- drivers/usb/gadget/storage_common.c | 14 +- drivers/usb/storage/Kconfig | 13 + drivers/usb/storage/Makefile | 1 + drivers/usb/storage/scsiglue.c | 8 +- drivers/usb/storage/sddr09.c | 2 +- drivers/usb/storage/transport.c | 10 +- drivers/usb/storage/uas.c | 751 ++++++++++++++++++++++++++++++++ drivers/usb/storage/unusual_alauda.h | 4 +- drivers/usb/storage/unusual_cypress.h | 4 +- drivers/usb/storage/unusual_datafab.h | 20 +- drivers/usb/storage/unusual_devs.h | 572 ++++++++++++------------ drivers/usb/storage/unusual_freecom.h | 2 +- drivers/usb/storage/unusual_isd200.h | 12 +- drivers/usb/storage/unusual_jumpshot.h | 2 +- drivers/usb/storage/unusual_karma.h | 2 +- drivers/usb/storage/unusual_onetouch.h | 4 +- drivers/usb/storage/unusual_sddr09.h | 12 +- drivers/usb/storage/unusual_sddr55.h | 8 +- drivers/usb/storage/unusual_usbat.h | 8 +- drivers/usb/storage/usb.c | 30 +- include/linux/usb/storage.h | 48 ++ include/linux/usb_usual.h | 37 +-- 27 files changed, 1183 insertions(+), 409 deletions(-) create mode 100644 drivers/usb/storage/uas.c create mode 100644 include/linux/usb/storage.h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html