aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/ether.c
diff options
context:
space:
mode:
authorOlav Kongas <ok@artecdesign.ee>2005-06-23 13:25:36 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-07-12 14:52:56 -0400
commit5db539e49fc7471e23bf3c94ca304f008cb7b7f3 (patch)
tree5b6bdd7f27efdd5fcd7efffa9a612afece17f533 /drivers/usb/gadget/ether.c
parent17f8bb7312fa9b00f80c3c0f8d5a5d698eb97bbd (diff)
[PATCH] USB: Fix kmalloc's flags type in USB
Greg, This patch fixes the kmalloc() flags argument type in USB subsystem; hopefully all of its occurences. The patch was made against patch-2.6.12-git2 from Jun 20. Cleanup of flags for kmalloc() in USB subsystem. Signed-off-by: Olav Kongas <ok@artecdesign.ee> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/ether.c')
-rw-r--r--drivers/usb/gadget/ether.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 5bb53ae88969..00a5d2566265 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -945,11 +945,11 @@ config_buf (enum usb_device_speed speed,
945 945
946/*-------------------------------------------------------------------------*/ 946/*-------------------------------------------------------------------------*/
947 947
948static void eth_start (struct eth_dev *dev, int gfp_flags); 948static void eth_start (struct eth_dev *dev, unsigned gfp_flags);
949static int alloc_requests (struct eth_dev *dev, unsigned n, int gfp_flags); 949static int alloc_requests (struct eth_dev *dev, unsigned n, unsigned gfp_flags);
950 950
951static int 951static int
952set_ether_config (struct eth_dev *dev, int gfp_flags) 952set_ether_config (struct eth_dev *dev, unsigned gfp_flags)
953{ 953{
954 int result = 0; 954 int result = 0;
955 struct usb_gadget *gadget = dev->gadget; 955 struct usb_gadget *gadget = dev->gadget;
@@ -1079,7 +1079,7 @@ static void eth_reset_config (struct eth_dev *dev)
1079 * that returns config descriptors, and altsetting code. 1079 * that returns config descriptors, and altsetting code.
1080 */ 1080 */
1081static int 1081static int
1082eth_set_config (struct eth_dev *dev, unsigned number, int gfp_flags) 1082eth_set_config (struct eth_dev *dev, unsigned number, unsigned gfp_flags)
1083{ 1083{
1084 int result = 0; 1084 int result = 0;
1085 struct usb_gadget *gadget = dev->gadget; 1085 struct usb_gadget *gadget = dev->gadget;
@@ -1596,7 +1596,7 @@ static void defer_kevent (struct eth_dev *dev, int flag)
1596static void rx_complete (struct usb_ep *ep, struct usb_request *req); 1596static void rx_complete (struct usb_ep *ep, struct usb_request *req);
1597 1597
1598static int 1598static int
1599rx_submit (struct eth_dev *dev, struct usb_request *req, int gfp_flags) 1599rx_submit (struct eth_dev *dev, struct usb_request *req, unsigned gfp_flags)
1600{ 1600{
1601 struct sk_buff *skb; 1601 struct sk_buff *skb;
1602 int retval = -ENOMEM; 1602 int retval = -ENOMEM;
@@ -1722,7 +1722,7 @@ clean:
1722} 1722}
1723 1723
1724static int prealloc (struct list_head *list, struct usb_ep *ep, 1724static int prealloc (struct list_head *list, struct usb_ep *ep,
1725 unsigned n, int gfp_flags) 1725 unsigned n, unsigned gfp_flags)
1726{ 1726{
1727 unsigned i; 1727 unsigned i;
1728 struct usb_request *req; 1728 struct usb_request *req;
@@ -1761,7 +1761,7 @@ extra:
1761 return 0; 1761 return 0;
1762} 1762}
1763 1763
1764static int alloc_requests (struct eth_dev *dev, unsigned n, int gfp_flags) 1764static int alloc_requests (struct eth_dev *dev, unsigned n, unsigned gfp_flags)
1765{ 1765{
1766 int status; 1766 int status;
1767 1767
@@ -1777,7 +1777,7 @@ fail:
1777 return status; 1777 return status;
1778} 1778}
1779 1779
1780static void rx_fill (struct eth_dev *dev, int gfp_flags) 1780static void rx_fill (struct eth_dev *dev, unsigned gfp_flags)
1781{ 1781{
1782 struct usb_request *req; 1782 struct usb_request *req;
1783 unsigned long flags; 1783 unsigned long flags;
@@ -2022,7 +2022,7 @@ static int rndis_control_ack (struct net_device *net)
2022 2022
2023#endif /* RNDIS */ 2023#endif /* RNDIS */
2024 2024
2025static void eth_start (struct eth_dev *dev, int gfp_flags) 2025static void eth_start (struct eth_dev *dev, unsigned gfp_flags)
2026{ 2026{
2027 DEBUG (dev, "%s\n", __FUNCTION__); 2027 DEBUG (dev, "%s\n", __FUNCTION__);
2028 2028