Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
xcap
xcap-capability-linux
Commits
55016f10
Commit
55016f10
authored
Oct 21, 2005
by
Al Viro
Committed by
Linus Torvalds
Oct 28, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] gfp_t: drivers/usb
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
Signed-off-by:
Linus Torvalds
<
torvalds@osdl.org
>
parent
970a9e73
Changes
37
Hide whitespace changes
Inline
Side-by-side
Showing
37 changed files
with
100 additions
and
100 deletions
+100
-100
drivers/usb/core/buffer.c
drivers/usb/core/buffer.c
+1
-1
drivers/usb/core/hcd.c
drivers/usb/core/hcd.c
+1
-1
drivers/usb/core/hcd.h
drivers/usb/core/hcd.h
+4
-4
drivers/usb/core/message.c
drivers/usb/core/message.c
+1
-1
drivers/usb/core/urb.c
drivers/usb/core/urb.c
+2
-2
drivers/usb/core/usb.c
drivers/usb/core/usb.c
+1
-1
drivers/usb/gadget/dummy_hcd.c
drivers/usb/gadget/dummy_hcd.c
+4
-4
drivers/usb/gadget/ether.c
drivers/usb/gadget/ether.c
+11
-11
drivers/usb/gadget/goku_udc.c
drivers/usb/gadget/goku_udc.c
+3
-3
drivers/usb/gadget/lh7a40x_udc.c
drivers/usb/gadget/lh7a40x_udc.c
+6
-6
drivers/usb/gadget/net2280.c
drivers/usb/gadget/net2280.c
+3
-3
drivers/usb/gadget/omap_udc.c
drivers/usb/gadget/omap_udc.c
+3
-3
drivers/usb/gadget/pxa2xx_udc.c
drivers/usb/gadget/pxa2xx_udc.c
+3
-3
drivers/usb/gadget/serial.c
drivers/usb/gadget/serial.c
+8
-8
drivers/usb/gadget/zero.c
drivers/usb/gadget/zero.c
+4
-4
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-hcd.c
+1
-1
drivers/usb/host/ehci-mem.c
drivers/usb/host/ehci-mem.c
+3
-3
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci-q.c
+3
-3
drivers/usb/host/ehci-sched.c
drivers/usb/host/ehci-sched.c
+7
-7
drivers/usb/host/isp116x-hcd.c
drivers/usb/host/isp116x-hcd.c
+1
-1
drivers/usb/host/ohci-hcd.c
drivers/usb/host/ohci-hcd.c
+1
-1
drivers/usb/host/ohci-mem.c
drivers/usb/host/ohci-mem.c
+2
-2
drivers/usb/host/sl811-hcd.c
drivers/usb/host/sl811-hcd.c
+1
-1
drivers/usb/host/uhci-q.c
drivers/usb/host/uhci-q.c
+1
-1
drivers/usb/misc/uss720.c
drivers/usb/misc/uss720.c
+3
-3
drivers/usb/net/asix.c
drivers/usb/net/asix.c
+1
-1
drivers/usb/net/gl620a.c
drivers/usb/net/gl620a.c
+1
-1
drivers/usb/net/kaweth.c
drivers/usb/net/kaweth.c
+3
-3
drivers/usb/net/net1080.c
drivers/usb/net/net1080.c
+1
-1
drivers/usb/net/rndis_host.c
drivers/usb/net/rndis_host.c
+1
-1
drivers/usb/net/usbnet.c
drivers/usb/net/usbnet.c
+1
-1
drivers/usb/net/usbnet.h
drivers/usb/net/usbnet.h
+1
-1
drivers/usb/net/zaurus.c
drivers/usb/net/zaurus.c
+1
-1
drivers/usb/net/zd1201.c
drivers/usb/net/zd1201.c
+1
-1
include/linux/usb.h
include/linux/usb.h
+4
-4
include/linux/usb_gadget.h
include/linux/usb_gadget.h
+6
-6
sound/usb/usbmidi.c
sound/usb/usbmidi.c
+1
-1
No files found.
drivers/usb/core/buffer.c
View file @
55016f10
...
...
@@ -106,7 +106,7 @@ void hcd_buffer_destroy (struct usb_hcd *hcd)
void
*
hcd_buffer_alloc
(
struct
usb_bus
*
bus
,
size_t
size
,
unsigned
mem_flags
,
gfp_t
mem_flags
,
dma_addr_t
*
dma
)
{
...
...
drivers/usb/core/hcd.c
View file @
55016f10
...
...
@@ -1112,7 +1112,7 @@ static void urb_unlink (struct urb *urb)
* expects usb_submit_urb() to have sanity checked and conditioned all
* inputs in the urb
*/
static
int
hcd_submit_urb
(
struct
urb
*
urb
,
unsigned
mem_flags
)
static
int
hcd_submit_urb
(
struct
urb
*
urb
,
gfp_t
mem_flags
)
{
int
status
;
struct
usb_hcd
*
hcd
=
urb
->
dev
->
bus
->
hcpriv
;
...
...
drivers/usb/core/hcd.h
View file @
55016f10
...
...
@@ -142,12 +142,12 @@ struct hcd_timeout { /* timeouts we allocate */
struct
usb_operations
{
int
(
*
get_frame_number
)
(
struct
usb_device
*
usb_dev
);
int
(
*
submit_urb
)
(
struct
urb
*
urb
,
unsigned
mem_flags
);
int
(
*
submit_urb
)
(
struct
urb
*
urb
,
gfp_t
mem_flags
);
int
(
*
unlink_urb
)
(
struct
urb
*
urb
,
int
status
);
/* allocate dma-consistent buffer for URB_DMA_NOMAPPING */
void
*
(
*
buffer_alloc
)(
struct
usb_bus
*
bus
,
size_t
size
,
unsigned
mem_flags
,
gfp_t
mem_flags
,
dma_addr_t
*
dma
);
void
(
*
buffer_free
)(
struct
usb_bus
*
bus
,
size_t
size
,
void
*
addr
,
dma_addr_t
dma
);
...
...
@@ -200,7 +200,7 @@ struct hc_driver {
int
(
*
urb_enqueue
)
(
struct
usb_hcd
*
hcd
,
struct
usb_host_endpoint
*
ep
,
struct
urb
*
urb
,
unsigned
mem_flags
);
gfp_t
mem_flags
);
int
(
*
urb_dequeue
)
(
struct
usb_hcd
*
hcd
,
struct
urb
*
urb
);
/* hw synch, freeing endpoint resources that urb_dequeue can't */
...
...
@@ -247,7 +247,7 @@ int hcd_buffer_create (struct usb_hcd *hcd);
void
hcd_buffer_destroy
(
struct
usb_hcd
*
hcd
);
void
*
hcd_buffer_alloc
(
struct
usb_bus
*
bus
,
size_t
size
,
unsigned
mem_flags
,
dma_addr_t
*
dma
);
gfp_t
mem_flags
,
dma_addr_t
*
dma
);
void
hcd_buffer_free
(
struct
usb_bus
*
bus
,
size_t
size
,
void
*
addr
,
dma_addr_t
dma
);
...
...
drivers/usb/core/message.c
View file @
55016f10
...
...
@@ -321,7 +321,7 @@ int usb_sg_init (
struct
scatterlist
*
sg
,
int
nents
,
size_t
length
,
unsigned
mem_flags
gfp_t
mem_flags
)
{
int
i
;
...
...
drivers/usb/core/urb.c
View file @
55016f10
...
...
@@ -60,7 +60,7 @@ void usb_init_urb(struct urb *urb)
*
* The driver must call usb_free_urb() when it is finished with the urb.
*/
struct
urb
*
usb_alloc_urb
(
int
iso_packets
,
unsigned
mem_flags
)
struct
urb
*
usb_alloc_urb
(
int
iso_packets
,
gfp_t
mem_flags
)
{
struct
urb
*
urb
;
...
...
@@ -224,7 +224,7 @@ struct urb * usb_get_urb(struct urb *urb)
* GFP_NOIO, unless b) or c) apply
*
*/
int
usb_submit_urb
(
struct
urb
*
urb
,
unsigned
mem_flags
)
int
usb_submit_urb
(
struct
urb
*
urb
,
gfp_t
mem_flags
)
{
int
pipe
,
temp
,
max
;
struct
usb_device
*
dev
;
...
...
drivers/usb/core/usb.c
View file @
55016f10
...
...
@@ -1147,7 +1147,7 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size,
void
*
usb_buffer_alloc
(
struct
usb_device
*
dev
,
size_t
size
,
unsigned
mem_flags
,
gfp_t
mem_flags
,
dma_addr_t
*
dma
)
{
...
...
drivers/usb/gadget/dummy_hcd.c
View file @
55016f10
...
...
@@ -470,7 +470,7 @@ static int dummy_disable (struct usb_ep *_ep)
}
static
struct
usb_request
*
dummy_alloc_request
(
struct
usb_ep
*
_ep
,
unsigned
mem_flags
)
dummy_alloc_request
(
struct
usb_ep
*
_ep
,
gfp_t
mem_flags
)
{
struct
dummy_ep
*
ep
;
struct
dummy_request
*
req
;
...
...
@@ -507,7 +507,7 @@ dummy_alloc_buffer (
struct
usb_ep
*
_ep
,
unsigned
bytes
,
dma_addr_t
*
dma
,
unsigned
mem_flags
gfp_t
mem_flags
)
{
char
*
retval
;
struct
dummy_ep
*
ep
;
...
...
@@ -541,7 +541,7 @@ fifo_complete (struct usb_ep *ep, struct usb_request *req)
static
int
dummy_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
unsigned
mem_flags
)
gfp_t
mem_flags
)
{
struct
dummy_ep
*
ep
;
struct
dummy_request
*
req
;
...
...
@@ -999,7 +999,7 @@ static int dummy_urb_enqueue (
struct
usb_hcd
*
hcd
,
struct
usb_host_endpoint
*
ep
,
struct
urb
*
urb
,
unsigned
mem_flags
gfp_t
mem_flags
)
{
struct
dummy
*
dum
;
struct
urbp
*
urbp
;
...
...
drivers/usb/gadget/ether.c
View file @
55016f10
...
...
@@ -945,11 +945,11 @@ config_buf (enum usb_device_speed speed,
/*-------------------------------------------------------------------------*/
static
void
eth_start
(
struct
eth_dev
*
dev
,
unsigned
gfp_flags
);
static
int
alloc_requests
(
struct
eth_dev
*
dev
,
unsigned
n
,
unsigned
gfp_flags
);
static
void
eth_start
(
struct
eth_dev
*
dev
,
gfp_t
gfp_flags
);
static
int
alloc_requests
(
struct
eth_dev
*
dev
,
unsigned
n
,
gfp_t
gfp_flags
);
static
int
set_ether_config
(
struct
eth_dev
*
dev
,
unsigned
gfp_flags
)
set_ether_config
(
struct
eth_dev
*
dev
,
gfp_t
gfp_flags
)
{
int
result
=
0
;
struct
usb_gadget
*
gadget
=
dev
->
gadget
;
...
...
@@ -1081,7 +1081,7 @@ static void eth_reset_config (struct eth_dev *dev)
* that returns config descriptors, and altsetting code.
*/
static
int
eth_set_config
(
struct
eth_dev
*
dev
,
unsigned
number
,
unsigned
gfp_flags
)
eth_set_config
(
struct
eth_dev
*
dev
,
unsigned
number
,
gfp_t
gfp_flags
)
{
int
result
=
0
;
struct
usb_gadget
*
gadget
=
dev
->
gadget
;
...
...
@@ -1598,7 +1598,7 @@ static void defer_kevent (struct eth_dev *dev, int flag)
static
void
rx_complete
(
struct
usb_ep
*
ep
,
struct
usb_request
*
req
);
static
int
rx_submit
(
struct
eth_dev
*
dev
,
struct
usb_request
*
req
,
unsigned
gfp_flags
)
rx_submit
(
struct
eth_dev
*
dev
,
struct
usb_request
*
req
,
gfp_t
gfp_flags
)
{
struct
sk_buff
*
skb
;
int
retval
=
-
ENOMEM
;
...
...
@@ -1724,7 +1724,7 @@ clean:
}
static
int
prealloc
(
struct
list_head
*
list
,
struct
usb_ep
*
ep
,
unsigned
n
,
unsigned
gfp_flags
)
unsigned
n
,
gfp_t
gfp_flags
)
{
unsigned
i
;
struct
usb_request
*
req
;
...
...
@@ -1763,7 +1763,7 @@ extra:
return
0
;
}
static
int
alloc_requests
(
struct
eth_dev
*
dev
,
unsigned
n
,
unsigned
gfp_flags
)
static
int
alloc_requests
(
struct
eth_dev
*
dev
,
unsigned
n
,
gfp_t
gfp_flags
)
{
int
status
;
...
...
@@ -1779,7 +1779,7 @@ fail:
return
status
;
}
static
void
rx_fill
(
struct
eth_dev
*
dev
,
unsigned
gfp_flags
)
static
void
rx_fill
(
struct
eth_dev
*
dev
,
gfp_t
gfp_flags
)
{
struct
usb_request
*
req
;
unsigned
long
flags
;
...
...
@@ -1962,7 +1962,7 @@ drop:
* normally just one notification will be queued.
*/
static
struct
usb_request
*
eth_req_alloc
(
struct
usb_ep
*
,
unsigned
,
unsigned
);
static
struct
usb_request
*
eth_req_alloc
(
struct
usb_ep
*
,
unsigned
,
gfp_t
);
static
void
eth_req_free
(
struct
usb_ep
*
ep
,
struct
usb_request
*
req
);
static
void
...
...
@@ -2024,7 +2024,7 @@ static int rndis_control_ack (struct net_device *net)
#endif
/* RNDIS */
static
void
eth_start
(
struct
eth_dev
*
dev
,
unsigned
gfp_flags
)
static
void
eth_start
(
struct
eth_dev
*
dev
,
gfp_t
gfp_flags
)
{
DEBUG
(
dev
,
"%s
\n
"
,
__FUNCTION__
);
...
...
@@ -2092,7 +2092,7 @@ static int eth_stop (struct net_device *net)
/*-------------------------------------------------------------------------*/
static
struct
usb_request
*
eth_req_alloc
(
struct
usb_ep
*
ep
,
unsigned
size
,
unsigned
gfp_flags
)
eth_req_alloc
(
struct
usb_ep
*
ep
,
unsigned
size
,
gfp_t
gfp_flags
)
{
struct
usb_request
*
req
;
...
...
drivers/usb/gadget/goku_udc.c
View file @
55016f10
...
...
@@ -269,7 +269,7 @@ static int goku_ep_disable(struct usb_ep *_ep)
/*-------------------------------------------------------------------------*/
static
struct
usb_request
*
goku_alloc_request
(
struct
usb_ep
*
_ep
,
unsigned
gfp_flags
)
goku_alloc_request
(
struct
usb_ep
*
_ep
,
gfp_t
gfp_flags
)
{
struct
goku_request
*
req
;
...
...
@@ -327,7 +327,7 @@ goku_free_request(struct usb_ep *_ep, struct usb_request *_req)
*/
static
void
*
goku_alloc_buffer
(
struct
usb_ep
*
_ep
,
unsigned
bytes
,
dma_addr_t
*
dma
,
unsigned
gfp_flags
)
dma_addr_t
*
dma
,
gfp_t
gfp_flags
)
{
void
*
retval
;
struct
goku_ep
*
ep
;
...
...
@@ -789,7 +789,7 @@ finished:
/*-------------------------------------------------------------------------*/
static
int
goku_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
unsigned
gfp_flags
)
goku_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
gfp_t
gfp_flags
)
{
struct
goku_request
*
req
;
struct
goku_ep
*
ep
;
...
...
drivers/usb/gadget/lh7a40x_udc.c
View file @
55016f10
...
...
@@ -71,13 +71,13 @@ static char *state_names[] = {
static
int
lh7a40x_ep_enable
(
struct
usb_ep
*
ep
,
const
struct
usb_endpoint_descriptor
*
);
static
int
lh7a40x_ep_disable
(
struct
usb_ep
*
ep
);
static
struct
usb_request
*
lh7a40x_alloc_request
(
struct
usb_ep
*
ep
,
in
t
);
static
struct
usb_request
*
lh7a40x_alloc_request
(
struct
usb_ep
*
ep
,
gfp_
t
);
static
void
lh7a40x_free_request
(
struct
usb_ep
*
ep
,
struct
usb_request
*
);
static
void
*
lh7a40x_alloc_buffer
(
struct
usb_ep
*
ep
,
unsigned
,
dma_addr_t
*
,
in
t
);
gfp_
t
);
static
void
lh7a40x_free_buffer
(
struct
usb_ep
*
ep
,
void
*
,
dma_addr_t
,
unsigned
);
static
int
lh7a40x_queue
(
struct
usb_ep
*
ep
,
struct
usb_request
*
,
in
t
);
static
int
lh7a40x_queue
(
struct
usb_ep
*
ep
,
struct
usb_request
*
,
gfp_
t
);
static
int
lh7a40x_dequeue
(
struct
usb_ep
*
ep
,
struct
usb_request
*
);
static
int
lh7a40x_set_halt
(
struct
usb_ep
*
ep
,
int
);
static
int
lh7a40x_fifo_status
(
struct
usb_ep
*
ep
);
...
...
@@ -1106,7 +1106,7 @@ static int lh7a40x_ep_disable(struct usb_ep *_ep)
}
static
struct
usb_request
*
lh7a40x_alloc_request
(
struct
usb_ep
*
ep
,
unsigned
gfp_flags
)
gfp_t
gfp_flags
)
{
struct
lh7a40x_request
*
req
;
...
...
@@ -1134,7 +1134,7 @@ static void lh7a40x_free_request(struct usb_ep *ep, struct usb_request *_req)
}
static
void
*
lh7a40x_alloc_buffer
(
struct
usb_ep
*
ep
,
unsigned
bytes
,
dma_addr_t
*
dma
,
unsigned
gfp_flags
)
dma_addr_t
*
dma
,
gfp_t
gfp_flags
)
{
char
*
retval
;
...
...
@@ -1158,7 +1158,7 @@ static void lh7a40x_free_buffer(struct usb_ep *ep, void *buf, dma_addr_t dma,
* NOTE: Sets INDEX register
*/
static
int
lh7a40x_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
unsigned
gfp_flags
)
gfp_t
gfp_flags
)
{
struct
lh7a40x_request
*
req
;
struct
lh7a40x_ep
*
ep
;
...
...
drivers/usb/gadget/net2280.c
View file @
55016f10
...
...
@@ -376,7 +376,7 @@ static int net2280_disable (struct usb_ep *_ep)
/*-------------------------------------------------------------------------*/
static
struct
usb_request
*
net2280_alloc_request
(
struct
usb_ep
*
_ep
,
unsigned
gfp_flags
)
net2280_alloc_request
(
struct
usb_ep
*
_ep
,
gfp_t
gfp_flags
)
{
struct
net2280_ep
*
ep
;
struct
net2280_request
*
req
;
...
...
@@ -463,7 +463,7 @@ net2280_alloc_buffer (
struct
usb_ep
*
_ep
,
unsigned
bytes
,
dma_addr_t
*
dma
,
unsigned
gfp_flags
gfp_t
gfp_flags
)
{
void
*
retval
;
...
...
@@ -897,7 +897,7 @@ done (struct net2280_ep *ep, struct net2280_request *req, int status)
/*-------------------------------------------------------------------------*/
static
int
net2280_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
unsigned
gfp_flags
)
net2280_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
gfp_t
gfp_flags
)
{
struct
net2280_request
*
req
;
struct
net2280_ep
*
ep
;
...
...
drivers/usb/gadget/omap_udc.c
View file @
55016f10
...
...
@@ -269,7 +269,7 @@ static int omap_ep_disable(struct usb_ep *_ep)
/*-------------------------------------------------------------------------*/
static
struct
usb_request
*
omap_alloc_request
(
struct
usb_ep
*
ep
,
unsigned
gfp_flags
)
omap_alloc_request
(
struct
usb_ep
*
ep
,
gfp_t
gfp_flags
)
{
struct
omap_req
*
req
;
...
...
@@ -298,7 +298,7 @@ omap_alloc_buffer(
struct
usb_ep
*
_ep
,
unsigned
bytes
,
dma_addr_t
*
dma
,
unsigned
gfp_flags
gfp_t
gfp_flags
)
{
void
*
retval
;
...
...
@@ -937,7 +937,7 @@ static void dma_channel_release(struct omap_ep *ep)
/*-------------------------------------------------------------------------*/
static
int
omap_ep_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
unsigned
gfp_flags
)
omap_ep_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
gfp_t
gfp_flags
)
{
struct
omap_ep
*
ep
=
container_of
(
_ep
,
struct
omap_ep
,
ep
);
struct
omap_req
*
req
=
container_of
(
_req
,
struct
omap_req
,
req
);
...
...
drivers/usb/gadget/pxa2xx_udc.c
View file @
55016f10
...
...
@@ -332,7 +332,7 @@ static int pxa2xx_ep_disable (struct usb_ep *_ep)
* pxa2xx_ep_alloc_request - allocate a request data structure
*/
static
struct
usb_request
*
pxa2xx_ep_alloc_request
(
struct
usb_ep
*
_ep
,
unsigned
gfp_flags
)
pxa2xx_ep_alloc_request
(
struct
usb_ep
*
_ep
,
gfp_t
gfp_flags
)
{
struct
pxa2xx_request
*
req
;
...
...
@@ -367,7 +367,7 @@ pxa2xx_ep_free_request (struct usb_ep *_ep, struct usb_request *_req)
*/
static
void
*
pxa2xx_ep_alloc_buffer
(
struct
usb_ep
*
_ep
,
unsigned
bytes
,
dma_addr_t
*
dma
,
unsigned
gfp_flags
)
dma_addr_t
*
dma
,
gfp_t
gfp_flags
)
{
char
*
retval
;
...
...
@@ -874,7 +874,7 @@ done:
/*-------------------------------------------------------------------------*/
static
int
pxa2xx_ep_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
unsigned
gfp_flags
)
pxa2xx_ep_queue
(
struct
usb_ep
*
_ep
,
struct
usb_request
*
_req
,
gfp_t
gfp_flags
)
{
struct
pxa2xx_request
*
req
;
struct
pxa2xx_ep
*
ep
;
...
...
drivers/usb/gadget/serial.c
View file @
55016f10
...
...
@@ -300,18 +300,18 @@ static int gs_build_config_buf(u8 *buf, enum usb_device_speed speed,
u8
type
,
unsigned
int
index
,
int
is_otg
);
static
struct
usb_request
*
gs_alloc_req
(
struct
usb_ep
*
ep
,
unsigned
int
len
,
unsigned
kmalloc_flags
);
gfp_t
kmalloc_flags
);
static
void
gs_free_req
(
struct
usb_ep
*
ep
,
struct
usb_request
*
req
);
static
struct
gs_req_entry
*
gs_alloc_req_entry
(
struct
usb_ep
*
ep
,
unsigned
len
,
unsigned
kmalloc_flags
);
gfp_t
kmalloc_flags
);
static
void
gs_free_req_entry
(
struct
usb_ep
*
ep
,
struct
gs_req_entry
*
req
);
static
int
gs_alloc_ports
(
struct
gs_dev
*
dev
,
unsigned
kmalloc_flags
);
static
int
gs_alloc_ports
(
struct
gs_dev
*
dev
,
gfp_t
kmalloc_flags
);
static
void
gs_free_ports
(
struct
gs_dev
*
dev
);
/* circular buffer */
static
struct
gs_buf
*
gs_buf_alloc
(
unsigned
int
size
,
unsigned
kmalloc_flags
);
static
struct
gs_buf
*
gs_buf_alloc
(
unsigned
int
size
,
gfp_t
kmalloc_flags
);
static
void
gs_buf_free
(
struct
gs_buf
*
gb
);
static
void
gs_buf_clear
(
struct
gs_buf
*
gb
);
static
unsigned
int
gs_buf_data_avail
(
struct
gs_buf
*
gb
);
...
...
@@ -2091,7 +2091,7 @@ static int gs_build_config_buf(u8 *buf, enum usb_device_speed speed,
* usb_request or NULL if there is an error.
*/
static
struct
usb_request
*
gs_alloc_req
(
struct
usb_ep
*
ep
,
unsigned
int
len
,
unsigned
kmalloc_flags
)
gs_alloc_req
(
struct
usb_ep
*
ep
,
unsigned
int
len
,
gfp_t
kmalloc_flags
)
{
struct
usb_request
*
req
;
...
...
@@ -2132,7 +2132,7 @@ static void gs_free_req(struct usb_ep *ep, struct usb_request *req)
* endpoint, buffer len, and kmalloc flags.
*/
static
struct
gs_req_entry
*
gs_alloc_req_entry
(
struct
usb_ep
*
ep
,
unsigned
len
,
unsigned
kmalloc_flags
)
gs_alloc_req_entry
(
struct
usb_ep
*
ep
,
unsigned
len
,
gfp_t
kmalloc_flags
)
{
struct
gs_req_entry
*
req
;
...
...
@@ -2173,7 +2173,7 @@ static void gs_free_req_entry(struct usb_ep *ep, struct gs_req_entry *req)
*
* The device lock is normally held when calling this function.
*/
static
int
gs_alloc_ports
(
struct
gs_dev
*
dev
,
unsigned
kmalloc_flags
)
static
int
gs_alloc_ports
(
struct
gs_dev
*
dev
,
gfp_t
kmalloc_flags
)
{
int
i
;
struct
gs_port
*
port
;
...
...
@@ -2255,7 +2255,7 @@ static void gs_free_ports(struct gs_dev *dev)
*
* Allocate a circular buffer and all associated memory.
*/
static
struct
gs_buf
*
gs_buf_alloc
(
unsigned
int
size
,
unsigned
kmalloc_flags
)
static
struct
gs_buf
*
gs_buf_alloc
(
unsigned
int
size
,
gfp_t
kmalloc_flags
)
{
struct
gs_buf
*
gb
;
...
...
drivers/usb/gadget/zero.c
View file @
55016f10
...
...
@@ -612,7 +612,7 @@ static void source_sink_complete (struct usb_ep *ep, struct usb_request *req)
}
static
struct
usb_request
*
source_sink_start_ep
(
struct
usb_ep
*
ep
,
unsigned
gfp_flags
)
source_sink_start_ep
(
struct
usb_ep
*
ep
,
gfp_t
gfp_flags
)
{
struct
usb_request
*
req
;
int
status
;
...
...
@@ -640,7 +640,7 @@ source_sink_start_ep (struct usb_ep *ep, unsigned gfp_flags)
}
static
int
set_source_sink_config
(
struct
zero_dev
*
dev
,
unsigned
gfp_flags
)
set_source_sink_config
(
struct
zero_dev
*
dev
,
gfp_t
gfp_flags
)
{
int
result
=
0
;
struct
usb_ep
*
ep
;
...
...
@@ -744,7 +744,7 @@ static void loopback_complete (struct usb_ep *ep, struct usb_request *req)
}
static
int
set_loopback_config
(
struct
zero_dev
*
dev
,
unsigned
gfp_flags
)
set_loopback_config
(
struct
zero_dev
*
dev
,
gfp_t
gfp_flags
)
{
int
result
=
0
;
struct
usb_ep
*
ep
;
...
...
@@ -845,7 +845,7 @@ static void zero_reset_config (struct zero_dev *dev)
* by limiting configuration choices (like the pxa2xx).
*/
static
int
zero_set_config
(
struct
zero_dev
*
dev
,
unsigned
number
,
unsigned
gfp_flags
)
zero_set_config
(
struct
zero_dev
*
dev
,
unsigned
number
,
gfp_t
gfp_flags
)
{
int
result
=
0
;
struct
usb_gadget
*
gadget
=
dev
->
gadget
;
...
...
drivers/usb/host/ehci-hcd.c
View file @
55016f10
...
...
@@ -983,7 +983,7 @@ static int ehci_urb_enqueue (
struct
usb_hcd
*
hcd
,
struct
usb_host_endpoint
*
ep
,
struct
urb
*
urb
,
unsigned
mem_flags
gfp_t
mem_flags
)
{
struct
ehci_hcd
*
ehci
=
hcd_to_ehci
(
hcd
);
struct
list_head
qtd_list
;
...
...
drivers/usb/host/ehci-mem.c
View file @
55016f10
...
...
@@ -45,7 +45,7 @@ static inline void ehci_qtd_init (struct ehci_qtd *qtd, dma_addr_t dma)
INIT_LIST_HEAD
(
&
qtd
->
qtd_list
);
}
static
struct
ehci_qtd
*
ehci_qtd_alloc
(
struct
ehci_hcd
*
ehci
,
in
t
flags
)
static
struct
ehci_qtd
*
ehci_qtd_alloc
(
struct
ehci_hcd
*
ehci
,
gfp_
t
flags
)
{
struct
ehci_qtd
*
qtd
;
dma_addr_t
dma
;
...
...
@@ -79,7 +79,7 @@ static void qh_destroy (struct kref *kref)
dma_pool_free
(
ehci
->
qh_pool
,
qh
,
qh
->
qh_dma
);
}
static
struct
ehci_qh
*
ehci_qh_alloc
(
struct
ehci_hcd
*
ehci
,
in
t
flags
)
static
struct
ehci_qh
*
ehci_qh_alloc
(
struct
ehci_hcd
*
ehci
,
gfp_
t
flags
)
{
struct
ehci_qh
*
qh
;
dma_addr_t
dma
;
...
...
@@ -161,7 +161,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci)
}
/* remember to add cleanup code (above) if you add anything here */
static
int
ehci_mem_init
(
struct
ehci_hcd
*
ehci
,
in
t
flags
)
static
int
ehci_mem_init
(
struct
ehci_hcd
*
ehci
,
gfp_
t
flags
)
{
int
i
;
...
...
drivers/usb/host/ehci-q.c
View file @
55016f10
...
...
@@ -477,7 +477,7 @@ qh_urb_transaction (
struct
ehci_hcd
*
ehci
,
struct
urb
*
urb
,
struct
list_head
*
head
,
in
t
flags
gfp_
t
flags
)
{
struct
ehci_qtd
*
qtd
,
*
qtd_prev
;
dma_addr_t
buf
;
...
...
@@ -629,7 +629,7 @@ static struct ehci_qh *
qh_make
(
struct
ehci_hcd
*
ehci
,
struct
urb
*
urb
,
in
t
flags
gfp_
t
flags
)
{
struct
ehci_qh
*
qh
=
ehci_qh_alloc
(
ehci
,
flags
);
u32
info1
=
0
,
info2
=
0
;
...
...
@@ -906,7 +906,7 @@ submit_async (
struct
usb_host_endpoint
*
ep
,
struct
urb
*
urb
,
struct
list_head
*
qtd_list
,
unsigned
mem_flags
gfp_t
mem_flags
)
{
struct
ehci_qtd
*
qtd
;
int
epnum
;
...
...
drivers/usb/host/ehci-sched.c
View file @
55016f10
...
...
@@ -589,7 +589,7 @@ static int intr_submit (
struct
usb_host_endpoint
*
ep
,
struct
urb
*
urb
,
struct
list_head
*
qtd_list
,
unsigned
mem_flags
gfp_t
mem_flags
)
{
unsigned
epnum
;
unsigned
long
flags
;
...
...
@@ -634,7 +634,7 @@ done:
/* ehci_iso_stream ops work with both ITD and SITD */
static
struct
ehci_iso_stream
*
iso_stream_alloc
(
unsigned
mem_flags
)
iso_stream_alloc
(
gfp_t
mem_flags
)
{
struct
ehci_iso_stream
*
stream
;
...
...
@@ -851,7 +851,7 @@ iso_stream_find (struct ehci_hcd *ehci, struct urb *urb)
/* ehci_iso_sched ops can be ITD-only or SITD-only */
static
struct
ehci_iso_sched
*
iso_sched_alloc
(
unsigned
packets
,
unsigned
mem_flags
)
iso_sched_alloc
(
unsigned
packets
,
gfp_t
mem_flags
)
{
struct
ehci_iso_sched
*
iso_sched
;
int
size
=
sizeof
*
iso_sched
;
...
...
@@ -924,7 +924,7 @@ itd_urb_transaction (
struct
ehci_iso_stream
*
stream
,
struct
ehci_hcd
*
ehci
,
struct
urb
*
urb
,
unsigned
mem_flags
gfp_t
mem_flags
)
{
struct
ehci_itd
*
itd
;
...
...
@@ -1418,7 +1418,7 @@ itd_complete (
/*-------------------------------------------------------------------------*/
static
int
itd_submit
(
struct
ehci_hcd
*
ehci
,
struct
urb
*
urb
,
unsigned
mem_flags
)
gfp_t
mem_flags
)
{
int
status
=
-
EINVAL
;
unsigned
long
flags
;
...
...
@@ -1529,7 +1529,7 @@ sitd_urb_transaction (
struct
ehci_iso_stream
*
stream
,
struct
ehci_hcd
*
ehci
,
struct
urb
*
urb
,
unsigned
mem_flags
gfp_t
mem_flags
)
{
struct
ehci_sitd
*
sitd
;
...
...
@@ -1779,7 +1779,7 @@ sitd_complete (
static
int
sitd_submit
(
struct
ehci_hcd
*
ehci
,
struct
urb
*
urb
,
unsigned
mem_flags
)
gfp_t
mem_flags
)
{
int
status
=
-
EINVAL
;
unsigned
long
flags
;
...
...
drivers/usb/host/isp116x-hcd.c
View file @
55016f10
...
...
@@ -694,7 +694,7 @@ static int balance(struct isp116x *isp116x, u16 period, u16 load)
static
int
isp116x_urb_enqueue
(
struct
usb_hcd
*
hcd
,
struct
usb_host_endpoint
*
hep
,
struct
urb
*
urb
,
unsigned
mem_flags
)
gfp_t
mem_flags
)
{
struct
isp116x
*
isp116x
=
hcd_to_isp116x
(
hcd
);
struct
usb_device
*
udev
=
urb
->
dev
;
...
...
drivers/usb/host/ohci-hcd.c
View file @
55016f10
...
...
@@ -180,7 +180,7 @@ static int ohci_urb_enqueue (
struct
usb_hcd
*
hcd
,
struct
usb_host_endpoint
*
ep
,
struct
urb
*
urb
,
unsigned
mem_flags
gfp_t
mem_flags
)
{
struct
ohci_hcd
*
ohci
=
hcd_to_ohci
(
hcd
);
struct
ed
*
ed
;
...
...
drivers/usb/host/ohci-mem.c
View file @
55016f10
...
...
@@ -84,7 +84,7 @@ dma_to_td (struct ohci_hcd *hc, dma_addr_t td_dma)
/* TDs ... */
static
struct
td
*
td_alloc
(
struct
ohci_hcd
*
hc
,
unsigned
mem_flags
)
td_alloc
(
struct
ohci_hcd
*
hc
,
gfp_t
mem_flags
)
{
dma_addr_t
dma
;
struct
td
*
td
;
...
...
@@ -118,7 +118,7 @@ td_free (struct ohci_hcd *hc, struct td *td)
/* EDs ... */
static
struct
ed
*