diff options
Diffstat (limited to 'drivers/usb/gadget/ether.c')
| -rw-r--r-- | drivers/usb/gadget/ether.c | 22 | 
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 49459e33e95..f1024e804d5 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -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;  |