History

usb: gadget: function: move u_f.h to include/linux/usb/func_utils.h

We move the func_utils.h header to include/linux/usb to be able to compile function drivers outside of the drivers/usb/gadget/function directory.

Michael Grzeschik committed 2 years ago

Commit d9c61bb1 parent f20998f9 files · +12 −12Browse files

Unified · Split

9 files
  1. drivers/usb/gadget/configfs.c +1 −1
  2. drivers/usb/gadget/function/f_fs.c +1 −1
  3. drivers/usb/gadget/function/f_hid.c +1 −1
  4. drivers/usb/gadget/function/f_loopback.c +1 −1
  5. drivers/usb/gadget/function/f_midi.c +1 −1
  6. drivers/usb/gadget/function/f_midi2.c +1 −1
  7. drivers/usb/gadget/function/f_sourcesink.c +1 −1
  8. drivers/usb/gadget/u_f.c +1 −1
  9. include/linux/usb/func_utils.h +4 −4
drivers/usb/gadget/configfs.c+1−1
@@ -6,10 +6,10 @@ · 5 unmodified lines
6#include <linux/kstrtox.h>6#include <linux/kstrtox.h>
7#include <linux/nls.h>7#include <linux/nls.h>
8#include <linux/usb/composite.h>8#include <linux/usb/composite.h>
9#include <linux/usb/func_utils.h>
9#include <linux/usb/gadget_configfs.h>10#include <linux/usb/gadget_configfs.h>
10#include <linux/usb/webusb.h>11#include <linux/usb/webusb.h>
11#include "configfs.h"12#include "configfs.h"
12#include "u_f.h"
13#include "u_os_desc.h"13#include "u_os_desc.h"
14 14
15static int check_user_usb_string(const char *name,15static int check_user_usb_string(const char *name,
drivers/usb/gadget/function/f_fs.c+1−1
@@ -33,6 +33,7 @@ · 32 unmodified lines
33#include <linux/usb/ccid.h>33#include <linux/usb/ccid.h>
34#include <linux/usb/composite.h>34#include <linux/usb/composite.h>
35#include <linux/usb/functionfs.h>35#include <linux/usb/functionfs.h>
36#include <linux/usb/func_utils.h>
36 37
37#include <linux/aio.h>38#include <linux/aio.h>
38#include <linux/kthread.h>39#include <linux/kthread.h>
@@ -40,7 +41,6 @@ · 1 unmodified line
40#include <linux/eventfd.h>41#include <linux/eventfd.h>
41 42
42#include "u_fs.h"43#include "u_fs.h"
43#include "u_f.h"
44#include "u_os_desc.h"44#include "u_os_desc.h"
45#include "configfs.h"45#include "configfs.h"
46 46
drivers/usb/gadget/function/f_hid.c+1−1
@@ -16,10 +16,10 @@ · 15 unmodified lines
16#include <linux/wait.h>16#include <linux/wait.h>
17#include <linux/sched.h>17#include <linux/sched.h>
18#include <linux/workqueue.h>18#include <linux/workqueue.h>
19#include <linux/usb/func_utils.h>
19#include <linux/usb/g_hid.h>20#include <linux/usb/g_hid.h>
20#include <uapi/linux/usb/g_hid.h>21#include <uapi/linux/usb/g_hid.h>
21 22
22#include "u_f.h"
23#include "u_hid.h"23#include "u_hid.h"
24 24
25#define HIDG_MINORS 425#define HIDG_MINORS 4
drivers/usb/gadget/function/f_loopback.c+1−1
@@ -14,9 +14,9 @@ · 13 unmodified lines
14#include <linux/module.h>14#include <linux/module.h>
15#include <linux/err.h>15#include <linux/err.h>
16#include <linux/usb/composite.h>16#include <linux/usb/composite.h>
17#include <linux/usb/func_utils.h>
17 18
18#include "g_zero.h"19#include "g_zero.h"
19#include "u_f.h"
20 20
21/*21/*
22 * LOOPBACK FUNCTION ... a testing vehicle for USB peripherals,22 * LOOPBACK FUNCTION ... a testing vehicle for USB peripherals,
drivers/usb/gadget/function/f_midi.c+1−1
@@ -30,11 +30,11 @@ · 29 unmodified lines
30#include <sound/rawmidi.h>30#include <sound/rawmidi.h>
31 31
32#include <linux/usb/ch9.h>32#include <linux/usb/ch9.h>
33#include <linux/usb/func_utils.h>
33#include <linux/usb/gadget.h>34#include <linux/usb/gadget.h>
34#include <linux/usb/audio.h>35#include <linux/usb/audio.h>
35#include <linux/usb/midi.h>36#include <linux/usb/midi.h>
36 37
37#include "u_f.h"
38#include "u_midi.h"38#include "u_midi.h"
39 39
40MODULE_AUTHOR("Ben Williamson");40MODULE_AUTHOR("Ben Williamson");
drivers/usb/gadget/function/f_midi2.c+1−1
@@ -15,11 +15,11 @@ · 14 unmodified lines
15#include <sound/ump_convert.h>15#include <sound/ump_convert.h>
16 16
17#include <linux/usb/ch9.h>17#include <linux/usb/ch9.h>
18#include <linux/usb/func_utils.h>
18#include <linux/usb/gadget.h>19#include <linux/usb/gadget.h>
19#include <linux/usb/audio.h>20#include <linux/usb/audio.h>
20#include <linux/usb/midi-v2.h>21#include <linux/usb/midi-v2.h>
21 22
22#include "u_f.h"
23#include "u_midi2.h"23#include "u_midi2.h"
24 24
25struct f_midi2;25struct f_midi2;
drivers/usb/gadget/function/f_sourcesink.c+1−1
@@ -13,10 +13,10 @@ · 12 unmodified lines
13#include <linux/device.h>13#include <linux/device.h>
14#include <linux/module.h>14#include <linux/module.h>
15#include <linux/usb/composite.h>15#include <linux/usb/composite.h>
16#include <linux/usb/func_utils.h>
16#include <linux/err.h>17#include <linux/err.h>
17 18
18#include "g_zero.h"19#include "g_zero.h"
19#include "u_f.h"
20 20
21/*21/*
22 * SOURCE/SINK FUNCTION ... a primary testing vehicle for USB peripheral22 * SOURCE/SINK FUNCTION ... a primary testing vehicle for USB peripheral
drivers/usb/gadget/u_f.c+1−1
@@ -8,8 +8,8 @@ · 7 unmodified lines
8 * Author: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>8 * Author: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
9 */9 */
10 10
11#include "u_f.h"
12#include <linux/usb/ch9.h>11#include <linux/usb/ch9.h>
12#include <linux/usb/func_utils.h>
13 13
14struct usb_request *alloc_ep_req(struct usb_ep *ep, size_t len)14struct usb_request *alloc_ep_req(struct usb_ep *ep, size_t len)
15{15{
include/linux/usb/func_utils.hrenamed from drivers/usb/gadget/u_f.h+4−4
@@ -1,6 +1,6 @@
1// SPDX-License-Identifier: GPL-2.01// SPDX-License-Identifier: GPL-2.0
2/*2/*
3 * u_f.h3 * func_utils.h
4 *4 *
5 * Utility definitions for USB functions5 * Utility definitions for USB functions
6 *6 *
@@ -10,8 +10,8 @@ · 3 unmodified lines
10 * Author: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>10 * Author: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
11 */11 */
12 12
13#ifndef __U_F_H__13#ifndef _FUNC_UTILS_H_
14#define __U_F_H__14#define _FUNC_UTILS_H_
15 15
16#include <linux/usb/gadget.h>16#include <linux/usb/gadget.h>
17#include <linux/overflow.h>17#include <linux/overflow.h>
@@ -83,4 +83,4 @@ static inline void free_ep_req(struct usb_ep *ep, struct usb_request *req) · 65 unmodified lines
83 usb_ep_free_request(ep, req);83 usb_ep_free_request(ep, req);
84}84}
85 85
86#endif /* __U_F_H__ */86#endif /* _FUNC_UTILS_H_ */