diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index c6104523d..008229ae7 100755
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -35,83 +35,6 @@
 	.bInterfaceClass = USB_CLASS_AUDIO, \
 	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL
 
-/* Quirk .driver_info, followed by the definition of the quirk entry;
- * put like QUIRK_DRIVER_INFO { ... } in each entry of the quirk table
- */
-#define QUIRK_DRIVER_INFO \
-	.driver_info = (unsigned long)&(const struct snd_usb_audio_quirk)
-
-/*
- * Macros for quirk data entries
- */
-
-/* Quirk data entry for ignoring the interface */
-#define QUIRK_DATA_IGNORE(_ifno) \
-	.ifnum = (_ifno), .type = QUIRK_IGNORE_INTERFACE
-/* Quirk data entry for a standard audio interface */
-#define QUIRK_DATA_STANDARD_AUDIO(_ifno) \
-	.ifnum = (_ifno), .type = QUIRK_AUDIO_STANDARD_INTERFACE
-/* Quirk data entry for a standard MIDI interface */
-#define QUIRK_DATA_STANDARD_MIDI(_ifno) \
-	.ifnum = (_ifno), .type = QUIRK_MIDI_STANDARD_INTERFACE
-/* Quirk data entry for a standard mixer interface */
-#define QUIRK_DATA_STANDARD_MIXER(_ifno) \
-	.ifnum = (_ifno), .type = QUIRK_AUDIO_STANDARD_MIXER
-
-/* Quirk data entry for Yamaha MIDI */
-#define QUIRK_DATA_MIDI_YAMAHA(_ifno) \
-	.ifnum = (_ifno), .type = QUIRK_MIDI_YAMAHA
-/* Quirk data entry for Edirol UAxx */
-#define QUIRK_DATA_EDIROL_UAXX(_ifno) \
-	.ifnum = (_ifno), .type = QUIRK_AUDIO_EDIROL_UAXX
-/* Quirk data entry for raw bytes interface */
-#define QUIRK_DATA_RAW_BYTES(_ifno) \
-	.ifnum = (_ifno), .type = QUIRK_MIDI_RAW_BYTES
-
-/* Quirk composite array terminator */
-#define QUIRK_COMPOSITE_END	{ .ifnum = -1 }
-
-/* Quirk data entry for composite quirks;
- * followed by the quirk array that is terminated with QUIRK_COMPOSITE_END
- * e.g. QUIRK_DATA_COMPOSITE { { quirk1 }, { quirk2 },..., QUIRK_COMPOSITE_END }
- */
-#define QUIRK_DATA_COMPOSITE \
-	.ifnum = QUIRK_ANY_INTERFACE, \
-	.type = QUIRK_COMPOSITE, \
-	.data = &(const struct snd_usb_audio_quirk[])
-
-/* Quirk data entry for a fixed audio endpoint;
- * followed by audioformat definition
- * e.g. QUIRK_DATA_AUDIOFORMAT(n) { .formats = xxx, ... }
- */
-#define QUIRK_DATA_AUDIOFORMAT(_ifno)	    \
-	.ifnum = (_ifno),		    \
-	.type = QUIRK_AUDIO_FIXED_ENDPOINT, \
-	.data = &(const struct audioformat)
-
-/* Quirk data entry for a fixed MIDI endpoint;
- * followed by snd_usb_midi_endpoint_info definition
- * e.g. QUIRK_DATA_MIDI_FIXED_ENDPOINT(n) { .out_cables = x, .in_cables = y }
- */
-#define QUIRK_DATA_MIDI_FIXED_ENDPOINT(_ifno) \
-	.ifnum = (_ifno),		      \
-	.type = QUIRK_MIDI_FIXED_ENDPOINT,    \
-	.data = &(const struct snd_usb_midi_endpoint_info)
-/* Quirk data entry for a MIDIMAN MIDI endpoint */
-#define QUIRK_DATA_MIDI_MIDIMAN(_ifno) \
-	.ifnum = (_ifno),	       \
-	.type = QUIRK_MIDI_MIDIMAN,    \
-	.data = &(const struct snd_usb_midi_endpoint_info)
-/* Quirk data entry for a EMAGIC MIDI endpoint */
-#define QUIRK_DATA_MIDI_EMAGIC(_ifno) \
-	.ifnum = (_ifno),	      \
-	.type = QUIRK_MIDI_EMAGIC,    \
-	.data = &(const struct snd_usb_midi_endpoint_info)
-
-/*
- * Here we go... the quirk table definition begins:
- */
-
 /* FTDI devices */
 {
 	USB_DEVICE(0x0403, 0xb8d8),