Greg KH <greg@xxxxxxxxx> writes: > On Wed, Sep 29, 2010 at 12:31:31PM +0200, Michal Nazarewicz wrote: >> From: Michal Nazarewicz <mina86@xxxxxxxxxx> >> >> This commit changes prefix for USB mass storage class >> related macros (ie. USB_SC_ for subclass and USB_PR_ for >> class). >> >> Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx> >> --- >> 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/storage/scsiglue.c | 8 +- >> drivers/usb/storage/sddr09.c | 2 +- >> drivers/usb/storage/transport.c | 10 +- >> 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 | 54 ++-- >> 21 files changed, 387 insertions(+), 387 deletions(-) >> >> >> > On Tue, Sep 28, 2010 at 12:55:32PM +0200, Michal Nazarewicz wrote: >> >> This commit changes storage_common.c and file_storage.c to >> >> reuse definitions from linux/usb/storage.h header file. >> >> 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? >> >> Fine by me. I'm Ccing some more addresses in case someone doesn't like the >> idea. >> >> Attached is patch that does exactly that. Done with: >> >> find -name '*.[ch]' -exec \ >> perl -i -pe 's/\bUS_(SC|PR)_/USB_${1}_/g' {} + >> >> (Maybe it'd be better to squash it with your patch thoug?) > > I think it might be better to do this by hand, as it broke the build > when applied :( Uh... Sorry. I'll figure this out by the end of the week and resend the patch. -- Best regards, _ _ .o. | Liege of Serenly Enlightened Majesty of o' \,=./ `o ..o | Computer Science, Michal "mina86" Nazarewicz (o o) ooo +--<mina86-tlen.pl>--<jid:mina86-jabber.org>--ooO--(_)--Ooo--
Attachment:
pgpaFEllnnw3Q.pgp
Description: PGP signature