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

@@ -6,10 +6,10 @@ · 5 unmodified lines
6	6	#include <linux/kstrtox.h>
7	7	#include <linux/nls.h>
8	8	#include <linux/usb/composite.h>
	9	+#include <linux/usb/func_utils.h>
9	10	#include <linux/usb/gadget_configfs.h>
10	11	#include <linux/usb/webusb.h>
11	12	#include "configfs.h"
12		−#include "u_f.h"
13	13	#include "u_os_desc.h"
14	14
15	15	static int check_user_usb_string(const char *name,

@@ -33,6 +33,7 @@ · 32 unmodified lines
33	33	#include <linux/usb/ccid.h>
34	34	#include <linux/usb/composite.h>
35	35	#include <linux/usb/functionfs.h>
	36	+#include <linux/usb/func_utils.h>
36	37
37	38	#include <linux/aio.h>
38	39	#include <linux/kthread.h>
@@ -40,7 +41,6 @@ · 1 unmodified line
40	41	#include <linux/eventfd.h>
41	42
42	43	#include "u_fs.h"
43		−#include "u_f.h"
44	44	#include "u_os_desc.h"
45	45	#include "configfs.h"
46	46

@@ -16,10 +16,10 @@ · 15 unmodified lines
16	16	#include <linux/wait.h>
17	17	#include <linux/sched.h>
18	18	#include <linux/workqueue.h>
	19	+#include <linux/usb/func_utils.h>
19	20	#include <linux/usb/g_hid.h>
20	21	#include <uapi/linux/usb/g_hid.h>
21	22
22		−#include "u_f.h"
23	23	#include "u_hid.h"
24	24
25	25	#define HIDG_MINORS 4

@@ -14,9 +14,9 @@ · 13 unmodified lines
14	14	#include <linux/module.h>
15	15	#include <linux/err.h>
16	16	#include <linux/usb/composite.h>
	17	+#include <linux/usb/func_utils.h>
17	18
18	19	#include "g_zero.h"
19		−#include "u_f.h"
20	20
21	21	/*
22	22	* LOOPBACK FUNCTION ... a testing vehicle for USB peripherals,

@@ -30,11 +30,11 @@ · 29 unmodified lines
30	30	#include <sound/rawmidi.h>
31	31
32	32	#include <linux/usb/ch9.h>
	33	+#include <linux/usb/func_utils.h>
33	34	#include <linux/usb/gadget.h>
34	35	#include <linux/usb/audio.h>
35	36	#include <linux/usb/midi.h>
36	37
37		−#include "u_f.h"
38	38	#include "u_midi.h"
39	39
40	40	MODULE_AUTHOR("Ben Williamson");

@@ -15,11 +15,11 @@ · 14 unmodified lines
15	15	#include <sound/ump_convert.h>
16	16
17	17	#include <linux/usb/ch9.h>
	18	+#include <linux/usb/func_utils.h>
18	19	#include <linux/usb/gadget.h>
19	20	#include <linux/usb/audio.h>
20	21	#include <linux/usb/midi-v2.h>
21	22
22		−#include "u_f.h"
23	23	#include "u_midi2.h"
24	24
25	25	struct f_midi2;

@@ -13,10 +13,10 @@ · 12 unmodified lines
13	13	#include <linux/device.h>
14	14	#include <linux/module.h>
15	15	#include <linux/usb/composite.h>
	16	+#include <linux/usb/func_utils.h>
16	17	#include <linux/err.h>
17	18
18	19	#include "g_zero.h"
19		−#include "u_f.h"
20	20
21	21	/*
22	22	* SOURCE/SINK FUNCTION ... a primary testing vehicle for USB peripheral

@@ -8,8 +8,8 @@ · 7 unmodified lines
8	8	* Author: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
9	9	*/
10	10
11		−#include "u_f.h"
12	11	#include <linux/usb/ch9.h>
	12	+#include <linux/usb/func_utils.h>
13	13
14	14	struct 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	1	// SPDX-License-Identifier: GPL-2.0
2	2	/*
3		− * u_f.h
	3	+ * func_utils.h
4	4	*
5	5	* Utility definitions for USB functions
6	6	*
@@ -10,8 +10,8 @@ · 3 unmodified lines
10	10	* Author: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
11	11	*/
12	12
13		−#ifndef __U_F_H__
14		−#define __U_F_H__
	13	+#ifndef _FUNC_UTILS_H_
	14	+#define _FUNC_UTILS_H_
15	15
16	16	#include <linux/usb/gadget.h>
17	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	83	usb_ep_free_request(ep, req);
84	84	}
85	85
86		−#endif /* __U_F_H__ */
	86	+#endif /* _FUNC_UTILS_H_ */