diff options
author | Michal Nazarewicz <mina86@mina86.com> | 2012-11-06 16:52:37 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-11-08 09:02:55 -0500 |
commit | c7800a34acac2dcb3e8d8038013e2dbea76bd8a9 (patch) | |
tree | 11eaff51048fc772d6c819594b481ea6e3287df8 /drivers/usb | |
parent | fa06920a3ece1ed43333992d35c0044e7a6c048a (diff) |
usb: gadget: storage_common: Remove FSG specific definitions.
Since g_file_storage has been removed, this commit removes code from
the storage_common.c file which has been used by file_storage.c only
(and not by f_mass_storage.c).
Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/storage_common.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index 14199d70beea..b381e0ca279d 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c | |||
@@ -78,34 +78,6 @@ | |||
78 | #define LWARN(lun, fmt, args...) dev_warn(&(lun)->dev, fmt, ## args) | 78 | #define LWARN(lun, fmt, args...) dev_warn(&(lun)->dev, fmt, ## args) |
79 | #define LINFO(lun, fmt, args...) dev_info(&(lun)->dev, fmt, ## args) | 79 | #define LINFO(lun, fmt, args...) dev_info(&(lun)->dev, fmt, ## args) |
80 | 80 | ||
81 | /* | ||
82 | * Keep those macros in sync with those in | ||
83 | * include/linux/usb/composite.h or else GCC will complain. If they | ||
84 | * are identical (the same names of arguments, white spaces in the | ||
85 | * same places) GCC will allow redefinition otherwise (even if some | ||
86 | * white space is removed or added) warning will be issued. | ||
87 | * | ||
88 | * Those macros are needed here because File Storage Gadget does not | ||
89 | * include the composite.h header. For composite gadgets those macros | ||
90 | * are redundant since composite.h is included any way. | ||
91 | * | ||
92 | * One could check whether those macros are already defined (which | ||
93 | * would indicate composite.h had been included) or not (which would | ||
94 | * indicate we were in FSG) but this is not done because a warning is | ||
95 | * desired if definitions here differ from the ones in composite.h. | ||
96 | * | ||
97 | * We want the definitions to match and be the same in File Storage | ||
98 | * Gadget as well as Mass Storage Function (and so composite gadgets | ||
99 | * using MSF). If someone changes them in composite.h it will produce | ||
100 | * a warning in this file when building MSF. | ||
101 | */ | ||
102 | #define DBG(d, fmt, args...) dev_dbg(&(d)->gadget->dev , fmt , ## args) | ||
103 | #define VDBG(d, fmt, args...) dev_vdbg(&(d)->gadget->dev , fmt , ## args) | ||
104 | #define ERROR(d, fmt, args...) dev_err(&(d)->gadget->dev , fmt , ## args) | ||
105 | #define WARNING(d, fmt, args...) dev_warn(&(d)->gadget->dev , fmt , ## args) | ||
106 | #define INFO(d, fmt, args...) dev_info(&(d)->gadget->dev , fmt , ## args) | ||
107 | |||
108 | |||
109 | 81 | ||
110 | #ifdef DUMP_MSGS | 82 | #ifdef DUMP_MSGS |
111 | 83 | ||