tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Link: https://lore.kernel.org/r/20240116-ml-topic-u9p-v12-1-9a27de5160e0@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
authored by
Michael Grzeschik
and committed by
Greg Kroah-Hartman
d9c61bb3
f20998f2
+12
-12
+1
-1
drivers/usb/gadget/configfs.c
+1
-1
drivers/usb/gadget/configfs.c
···
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,
+1
-1
drivers/usb/gadget/function/f_fs.c
+1
-1
drivers/usb/gadget/function/f_fs.c
···
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>
···
41
40
#include <linux/eventfd.h>
42
41
43
42
#include "u_fs.h"
44
-
#include "u_f.h"
45
43
#include "u_os_desc.h"
46
44
#include "configfs.h"
47
45
+1
-1
drivers/usb/gadget/function/f_hid.c
+1
-1
drivers/usb/gadget/function/f_hid.c
···
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
+1
-1
drivers/usb/gadget/function/f_loopback.c
+1
-1
drivers/usb/gadget/function/f_loopback.c
+1
-1
drivers/usb/gadget/function/f_midi.c
+1
-1
drivers/usb/gadget/function/f_midi.c
···
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");
+1
-1
drivers/usb/gadget/function/f_midi2.c
+1
-1
drivers/usb/gadget/function/f_midi2.c
···
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;
+1
-1
drivers/usb/gadget/function/f_sourcesink.c
+1
-1
drivers/usb/gadget/function/f_sourcesink.c
···
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
+1
-1
drivers/usb/gadget/u_f.c
+1
-1
drivers/usb/gadget/u_f.c
+4
-4
drivers/usb/gadget/u_f.h
include/linux/usb/func_utils.h
+4
-4
drivers/usb/gadget/u_f.h
include/linux/usb/func_utils.h
···
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
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
83
usb_ep_free_request(ep, req);
84
84
}
85
85
86
-
#endif /* __U_F_H__ */
86
+
#endif /* _FUNC_UTILS_H_ */