Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: gadget: remove gadget_chips.h

This header file contains helpers for quirks based on UDC controller name.
Since we have generic quirk bitfields in usb_gadget structure for all of
these quirks we don't need to have this header any longer.

This patch removes gadget_chips.h file and makes sure that it's no longer
included anywhere in kernel sources.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

authored by

Robert Baldyga and committed by
Felipe Balbi
adab4339 26b8aa45

-74
-2
drivers/usb/gadget/epautoconf.c
··· 20 20 #include <linux/usb/ch9.h> 21 21 #include <linux/usb/gadget.h> 22 22 23 - #include "gadget_chips.h" 24 - 25 23 /** 26 24 * usb_ep_autoconfig_ss() - choose an endpoint matching the ep 27 25 * descriptor and ep companion descriptor
-1
drivers/usb/gadget/function/f_acm.c
··· 21 21 #include <linux/err.h> 22 22 23 23 #include "u_serial.h" 24 - #include "gadget_chips.h" 25 24 26 25 27 26 /*
-1
drivers/usb/gadget/function/f_mass_storage.c
··· 219 219 #include <linux/usb/gadget.h> 220 220 #include <linux/usb/composite.h> 221 221 222 - #include "gadget_chips.h" 223 222 #include "configfs.h" 224 223 225 224
-1
drivers/usb/gadget/function/f_obex.c
··· 20 20 #include <linux/module.h> 21 21 22 22 #include "u_serial.h" 23 - #include "gadget_chips.h" 24 23 25 24 26 25 /*
-1
drivers/usb/gadget/function/f_serial.c
··· 16 16 #include <linux/device.h> 17 17 18 18 #include "u_serial.h" 19 - #include "gadget_chips.h" 20 19 21 20 22 21 /*
-1
drivers/usb/gadget/function/f_sourcesink.c
··· 20 20 #include <linux/err.h> 21 21 22 22 #include "g_zero.h" 23 - #include "gadget_chips.h" 24 23 #include "u_f.h" 25 24 26 25 /*
-2
drivers/usb/gadget/function/u_ether.h
··· 20 20 #include <linux/usb/cdc.h> 21 21 #include <linux/netdevice.h> 22 22 23 - #include "gadget_chips.h" 24 - 25 23 #define QMULT_DEFAULT 5 26 24 27 25 /*
-2
drivers/usb/gadget/function/u_uac1.h
··· 21 21 #include <sound/pcm.h> 22 22 #include <sound/pcm_params.h> 23 23 24 - #include "gadget_chips.h" 25 - 26 24 #define FILE_PCM_PLAYBACK "/dev/snd/pcmC0D0p" 27 25 #define FILE_PCM_CAPTURE "/dev/snd/pcmC0D0c" 28 26 #define FILE_CONTROL "/dev/snd/controlC0"
-1
drivers/usb/gadget/legacy/audio.c
··· 15 15 #include <linux/module.h> 16 16 #include <linux/usb/composite.h> 17 17 18 - #include "gadget_chips.h" 19 18 #define DRIVER_DESC "Linux USB Audio Gadget" 20 19 #define DRIVER_VERSION "Feb 2, 2012" 21 20
-2
drivers/usb/gadget/legacy/gmidi.c
··· 35 35 #include <linux/usb/audio.h> 36 36 #include <linux/usb/midi.h> 37 37 38 - #include "gadget_chips.h" 39 - 40 38 #include "u_midi.h" 41 39 42 40 /*-------------------------------------------------------------------------*/
-1
drivers/usb/gadget/legacy/hid.c
··· 19 19 #include <linux/usb/composite.h> 20 20 #include <linux/usb/g_hid.h> 21 21 22 - #include "gadget_chips.h" 23 22 #define DRIVER_DESC "HID Gadget" 24 23 #define DRIVER_VERSION "2010/03/16" 25 24
-1
drivers/usb/gadget/legacy/nokia.c
··· 23 23 #include "u_ether.h" 24 24 #include "u_phonet.h" 25 25 #include "u_ecm.h" 26 - #include "gadget_chips.h" 27 26 #include "f_mass_storage.h" 28 27 29 28 /* Defines */
-2
drivers/usb/gadget/legacy/printer.c
··· 19 19 #include <linux/usb/gadget.h> 20 20 #include <linux/usb/g_printer.h> 21 21 22 - #include "gadget_chips.h" 23 - 24 22 USB_GADGET_COMPOSITE_OPTIONS(); 25 23 26 24 #define DRIVER_DESC "Printer Gadget"
-1
drivers/usb/gadget/legacy/serial.c
··· 17 17 #include <linux/tty_flip.h> 18 18 19 19 #include "u_serial.h" 20 - #include "gadget_chips.h" 21 20 22 21 23 22 /* Defines */
-55
drivers/usb/gadget/udc/gadget_chips.h
··· 1 - /* 2 - * USB device controllers have lots of quirks. Use these macros in 3 - * gadget drivers or other code that needs to deal with them, and which 4 - * autoconfigures instead of using early binding to the hardware. 5 - * 6 - * This SHOULD eventually work like the ARM mach_is_*() stuff, driven by 7 - * some config file that gets updated as new hardware is supported. 8 - * (And avoiding all runtime comparisons in typical one-choice configs!) 9 - * 10 - * NOTE: some of these controller drivers may not be available yet. 11 - * Some are available on 2.4 kernels; several are available, but not 12 - * yet pushed in the 2.6 mainline tree. 13 - */ 14 - 15 - #ifndef __GADGET_CHIPS_H 16 - #define __GADGET_CHIPS_H 17 - 18 - #include <linux/usb/gadget.h> 19 - 20 - /* 21 - * NOTICE: the entries below are alphabetical and should be kept 22 - * that way. 23 - * 24 - * Always be sure to add new entries to the correct position or 25 - * accept the bashing later. 26 - * 27 - * If you have forgotten the alphabetical order let VIM/EMACS 28 - * do that for you. 29 - */ 30 - #define gadget_is_at91(g) (!strcmp("at91_udc", (g)->name)) 31 - #define gadget_is_goku(g) (!strcmp("goku_udc", (g)->name)) 32 - #define gadget_is_musbhdrc(g) (!strcmp("musb-hdrc", (g)->name)) 33 - #define gadget_is_net2280(g) (!strcmp("net2280", (g)->name)) 34 - #define gadget_is_pxa(g) (!strcmp("pxa25x_udc", (g)->name)) 35 - #define gadget_is_pxa27x(g) (!strcmp("pxa27x_udc", (g)->name)) 36 - 37 - /** 38 - * gadget_supports_altsettings - return true if altsettings work 39 - * @gadget: the gadget in question 40 - */ 41 - static inline bool gadget_supports_altsettings(struct usb_gadget *gadget) 42 - { 43 - /* PXA 21x/25x/26x has no altsettings at all */ 44 - if (gadget_is_pxa(gadget)) 45 - return false; 46 - 47 - /* PXA 27x and 3xx have *broken* altsetting support */ 48 - if (gadget_is_pxa27x(gadget)) 49 - return false; 50 - 51 - /* Everything else is *presumably* fine ... */ 52 - return true; 53 - } 54 - 55 - #endif /* __GADGET_CHIPS_H */