diff options
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 30 | ||||
| -rw-r--r-- | drivers/usb/gadget/ether.c | 22 | ||||
| -rw-r--r-- | drivers/usb/gadget/goku_udc.c | 6 | ||||
| -rw-r--r-- | drivers/usb/gadget/lh7a40x_udc.c | 12 | ||||
| -rw-r--r-- | drivers/usb/gadget/net2280.c | 6 | ||||
| -rw-r--r-- | drivers/usb/gadget/omap_udc.c | 15 | ||||
| -rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.c | 25 | ||||
| -rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.h | 8 | ||||
| -rw-r--r-- | drivers/usb/gadget/serial.c | 16 | ||||
| -rw-r--r-- | drivers/usb/gadget/zero.c | 8 |
10 files changed, 64 insertions, 84 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 583db7c38cf1..503201764f6b 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c | |||
| @@ -470,7 +470,7 @@ static int dummy_disable (struct usb_ep *_ep) | |||
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | static struct usb_request * | 472 | static struct usb_request * |
| 473 | dummy_alloc_request (struct usb_ep *_ep, unsigned mem_flags) | 473 | dummy_alloc_request (struct usb_ep *_ep, gfp_t mem_flags) |
| 474 | { | 474 | { |
| 475 | struct dummy_ep *ep; | 475 | struct dummy_ep *ep; |
| 476 | struct dummy_request *req; | 476 | struct dummy_request *req; |
| @@ -507,7 +507,7 @@ dummy_alloc_buffer ( | |||
| 507 | struct usb_ep *_ep, | 507 | struct usb_ep *_ep, |
| 508 | unsigned bytes, | 508 | unsigned bytes, |
| 509 | dma_addr_t *dma, | 509 | dma_addr_t *dma, |
| 510 | unsigned mem_flags | 510 | gfp_t mem_flags |
| 511 | ) { | 511 | ) { |
| 512 | char *retval; | 512 | char *retval; |
| 513 | struct dummy_ep *ep; | 513 | struct dummy_ep *ep; |
| @@ -541,7 +541,7 @@ fifo_complete (struct usb_ep *ep, struct usb_request *req) | |||
| 541 | 541 | ||
| 542 | static int | 542 | static int |
| 543 | dummy_queue (struct usb_ep *_ep, struct usb_request *_req, | 543 | dummy_queue (struct usb_ep *_ep, struct usb_request *_req, |
| 544 | unsigned mem_flags) | 544 | gfp_t mem_flags) |
| 545 | { | 545 | { |
| 546 | struct dummy_ep *ep; | 546 | struct dummy_ep *ep; |
| 547 | struct dummy_request *req; | 547 | struct dummy_request *req; |
| @@ -935,14 +935,10 @@ static int dummy_udc_remove (struct device *dev) | |||
| 935 | return 0; | 935 | return 0; |
| 936 | } | 936 | } |
| 937 | 937 | ||
| 938 | static int dummy_udc_suspend (struct device *dev, pm_message_t state, | 938 | static int dummy_udc_suspend (struct device *dev, pm_message_t state) |
| 939 | u32 level) | ||
| 940 | { | 939 | { |
| 941 | struct dummy *dum = dev_get_drvdata(dev); | 940 | struct dummy *dum = dev_get_drvdata(dev); |
| 942 | 941 | ||
| 943 | if (level != SUSPEND_DISABLE) | ||
| 944 | return 0; | ||
| 945 | |||
| 946 | dev_dbg (dev, "%s\n", __FUNCTION__); | 942 | dev_dbg (dev, "%s\n", __FUNCTION__); |
| 947 | spin_lock_irq (&dum->lock); | 943 | spin_lock_irq (&dum->lock); |
| 948 | dum->udc_suspended = 1; | 944 | dum->udc_suspended = 1; |
| @@ -954,13 +950,10 @@ static int dummy_udc_suspend (struct device *dev, pm_message_t state, | |||
| 954 | return 0; | 950 | return 0; |
| 955 | } | 951 | } |
| 956 | 952 | ||
| 957 | static int dummy_udc_resume (struct device *dev, u32 level) | 953 | static int dummy_udc_resume (struct device *dev) |
| 958 | { | 954 | { |
| 959 | struct dummy *dum = dev_get_drvdata(dev); | 955 | struct dummy *dum = dev_get_drvdata(dev); |
| 960 | 956 | ||
| 961 | if (level != RESUME_ENABLE) | ||
| 962 | return 0; | ||
| 963 | |||
| 964 | dev_dbg (dev, "%s\n", __FUNCTION__); | 957 | dev_dbg (dev, "%s\n", __FUNCTION__); |
| 965 | spin_lock_irq (&dum->lock); | 958 | spin_lock_irq (&dum->lock); |
| 966 | dum->udc_suspended = 0; | 959 | dum->udc_suspended = 0; |
| @@ -999,7 +992,7 @@ static int dummy_urb_enqueue ( | |||
| 999 | struct usb_hcd *hcd, | 992 | struct usb_hcd *hcd, |
| 1000 | struct usb_host_endpoint *ep, | 993 | struct usb_host_endpoint *ep, |
| 1001 | struct urb *urb, | 994 | struct urb *urb, |
| 1002 | unsigned mem_flags | 995 | gfp_t mem_flags |
| 1003 | ) { | 996 | ) { |
| 1004 | struct dummy *dum; | 997 | struct dummy *dum; |
| 1005 | struct urbp *urbp; | 998 | struct urbp *urbp; |
| @@ -1936,14 +1929,10 @@ static int dummy_hcd_remove (struct device *dev) | |||
| 1936 | return 0; | 1929 | return 0; |
| 1937 | } | 1930 | } |
| 1938 | 1931 | ||
| 1939 | static int dummy_hcd_suspend (struct device *dev, pm_message_t state, | 1932 | static int dummy_hcd_suspend (struct device *dev, pm_message_t state) |
| 1940 | u32 level) | ||
| 1941 | { | 1933 | { |
| 1942 | struct usb_hcd *hcd; | 1934 | struct usb_hcd *hcd; |
| 1943 | 1935 | ||
| 1944 | if (level != SUSPEND_DISABLE) | ||
| 1945 | return 0; | ||
| 1946 | |||
| 1947 | dev_dbg (dev, "%s\n", __FUNCTION__); | 1936 | dev_dbg (dev, "%s\n", __FUNCTION__); |
| 1948 | hcd = dev_get_drvdata (dev); | 1937 | hcd = dev_get_drvdata (dev); |
| 1949 | 1938 | ||
| @@ -1958,13 +1947,10 @@ static int dummy_hcd_suspend (struct device *dev, pm_message_t state, | |||
| 1958 | return 0; | 1947 | return 0; |
| 1959 | } | 1948 | } |
| 1960 | 1949 | ||
| 1961 | static int dummy_hcd_resume (struct device *dev, u32 level) | 1950 | static int dummy_hcd_resume (struct device *dev) |
| 1962 | { | 1951 | { |
| 1963 | struct usb_hcd *hcd; | 1952 | struct usb_hcd *hcd; |
| 1964 | 1953 | ||
| 1965 | if (level != RESUME_ENABLE) | ||
| 1966 | return 0; | ||
| 1967 | |||
| 1968 | dev_dbg (dev, "%s\n", __FUNCTION__); | 1954 | dev_dbg (dev, "%s\n", __FUNCTION__); |
| 1969 | hcd = dev_get_drvdata (dev); | 1955 | hcd = dev_get_drvdata (dev); |
| 1970 | hcd->state = HC_STATE_RUNNING; | 1956 | hcd->state = HC_STATE_RUNNING; |
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 49459e33e952..f1024e804d5c 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 | ||
| 948 | static void eth_start (struct eth_dev *dev, unsigned gfp_flags); | 948 | static void eth_start (struct eth_dev *dev, gfp_t gfp_flags); |
| 949 | static int alloc_requests (struct eth_dev *dev, unsigned n, unsigned gfp_flags); | 949 | static int alloc_requests (struct eth_dev *dev, unsigned n, gfp_t gfp_flags); |
| 950 | 950 | ||
| 951 | static int | 951 | static int |
| 952 | set_ether_config (struct eth_dev *dev, unsigned gfp_flags) | 952 | set_ether_config (struct eth_dev *dev, gfp_t 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; |
| @@ -1081,7 +1081,7 @@ static void eth_reset_config (struct eth_dev *dev) | |||
| 1081 | * that returns config descriptors, and altsetting code. | 1081 | * that returns config descriptors, and altsetting code. |
| 1082 | */ | 1082 | */ |
| 1083 | static int | 1083 | static int |
| 1084 | eth_set_config (struct eth_dev *dev, unsigned number, unsigned gfp_flags) | 1084 | eth_set_config (struct eth_dev *dev, unsigned number, gfp_t gfp_flags) |
| 1085 | { | 1085 | { |
| 1086 | int result = 0; | 1086 | int result = 0; |
| 1087 | struct usb_gadget *gadget = dev->gadget; | 1087 | struct usb_gadget *gadget = dev->gadget; |
| @@ -1598,7 +1598,7 @@ static void defer_kevent (struct eth_dev *dev, int flag) | |||
| 1598 | static void rx_complete (struct usb_ep *ep, struct usb_request *req); | 1598 | static void rx_complete (struct usb_ep *ep, struct usb_request *req); |
| 1599 | 1599 | ||
| 1600 | static int | 1600 | static int |
| 1601 | rx_submit (struct eth_dev *dev, struct usb_request *req, unsigned gfp_flags) | 1601 | rx_submit (struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags) |
| 1602 | { | 1602 | { |
| 1603 | struct sk_buff *skb; | 1603 | struct sk_buff *skb; |
| 1604 | int retval = -ENOMEM; | 1604 | int retval = -ENOMEM; |
| @@ -1724,7 +1724,7 @@ clean: | |||
| 1724 | } | 1724 | } |
| 1725 | 1725 | ||
| 1726 | static int prealloc (struct list_head *list, struct usb_ep *ep, | 1726 | static int prealloc (struct list_head *list, struct usb_ep *ep, |
| 1727 | unsigned n, unsigned gfp_flags) | 1727 | unsigned n, gfp_t gfp_flags) |
| 1728 | { | 1728 | { |
| 1729 | unsigned i; | 1729 | unsigned i; |
| 1730 | struct usb_request *req; | 1730 | struct usb_request *req; |
| @@ -1763,7 +1763,7 @@ extra: | |||
| 1763 | return 0; | 1763 | return 0; |
| 1764 | } | 1764 | } |
| 1765 | 1765 | ||
| 1766 | static int alloc_requests (struct eth_dev *dev, unsigned n, unsigned gfp_flags) | 1766 | static int alloc_requests (struct eth_dev *dev, unsigned n, gfp_t gfp_flags) |
| 1767 | { | 1767 | { |
| 1768 | int status; | 1768 | int status; |
| 1769 | 1769 | ||
| @@ -1779,7 +1779,7 @@ fail: | |||
| 1779 | return status; | 1779 | return status; |
| 1780 | } | 1780 | } |
| 1781 | 1781 | ||
| 1782 | static void rx_fill (struct eth_dev *dev, unsigned gfp_flags) | 1782 | static void rx_fill (struct eth_dev *dev, gfp_t gfp_flags) |
| 1783 | { | 1783 | { |
| 1784 | struct usb_request *req; | 1784 | struct usb_request *req; |
| 1785 | unsigned long flags; | 1785 | unsigned long flags; |
| @@ -1962,7 +1962,7 @@ drop: | |||
| 1962 | * normally just one notification will be queued. | 1962 | * normally just one notification will be queued. |
| 1963 | */ | 1963 | */ |
| 1964 | 1964 | ||
| 1965 | static struct usb_request *eth_req_alloc (struct usb_ep *, unsigned, unsigned); | 1965 | static struct usb_request *eth_req_alloc (struct usb_ep *, unsigned, gfp_t); |
| 1966 | static void eth_req_free (struct usb_ep *ep, struct usb_request *req); | 1966 | static void eth_req_free (struct usb_ep *ep, struct usb_request *req); |
| 1967 | 1967 | ||
| 1968 | static void | 1968 | static void |
| @@ -2024,7 +2024,7 @@ static int rndis_control_ack (struct net_device *net) | |||
| 2024 | 2024 | ||
| 2025 | #endif /* RNDIS */ | 2025 | #endif /* RNDIS */ |
| 2026 | 2026 | ||
| 2027 | static void eth_start (struct eth_dev *dev, unsigned gfp_flags) | 2027 | static void eth_start (struct eth_dev *dev, gfp_t gfp_flags) |
| 2028 | { | 2028 | { |
| 2029 | DEBUG (dev, "%s\n", __FUNCTION__); | 2029 | DEBUG (dev, "%s\n", __FUNCTION__); |
| 2030 | 2030 | ||
| @@ -2092,7 +2092,7 @@ static int eth_stop (struct net_device *net) | |||
| 2092 | /*-------------------------------------------------------------------------*/ | 2092 | /*-------------------------------------------------------------------------*/ |
| 2093 | 2093 | ||
| 2094 | static struct usb_request * | 2094 | static struct usb_request * |
| 2095 | eth_req_alloc (struct usb_ep *ep, unsigned size, unsigned gfp_flags) | 2095 | eth_req_alloc (struct usb_ep *ep, unsigned size, gfp_t gfp_flags) |
| 2096 | { | 2096 | { |
| 2097 | struct usb_request *req; | 2097 | struct usb_request *req; |
| 2098 | 2098 | ||
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c index eaab26f4ed37..b0f3cd63e3b9 100644 --- a/drivers/usb/gadget/goku_udc.c +++ b/drivers/usb/gadget/goku_udc.c | |||
| @@ -269,7 +269,7 @@ static int goku_ep_disable(struct usb_ep *_ep) | |||
| 269 | /*-------------------------------------------------------------------------*/ | 269 | /*-------------------------------------------------------------------------*/ |
| 270 | 270 | ||
| 271 | static struct usb_request * | 271 | static struct usb_request * |
| 272 | goku_alloc_request(struct usb_ep *_ep, unsigned gfp_flags) | 272 | goku_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags) |
| 273 | { | 273 | { |
| 274 | struct goku_request *req; | 274 | struct goku_request *req; |
| 275 | 275 | ||
| @@ -327,7 +327,7 @@ goku_free_request(struct usb_ep *_ep, struct usb_request *_req) | |||
| 327 | */ | 327 | */ |
| 328 | static void * | 328 | static void * |
| 329 | goku_alloc_buffer(struct usb_ep *_ep, unsigned bytes, | 329 | goku_alloc_buffer(struct usb_ep *_ep, unsigned bytes, |
| 330 | dma_addr_t *dma, unsigned gfp_flags) | 330 | dma_addr_t *dma, gfp_t gfp_flags) |
| 331 | { | 331 | { |
| 332 | void *retval; | 332 | void *retval; |
| 333 | struct goku_ep *ep; | 333 | struct goku_ep *ep; |
| @@ -789,7 +789,7 @@ finished: | |||
| 789 | /*-------------------------------------------------------------------------*/ | 789 | /*-------------------------------------------------------------------------*/ |
| 790 | 790 | ||
| 791 | static int | 791 | static int |
| 792 | goku_queue(struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags) | 792 | goku_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) |
| 793 | { | 793 | { |
| 794 | struct goku_request *req; | 794 | struct goku_request *req; |
| 795 | struct goku_ep *ep; | 795 | struct goku_ep *ep; |
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index 4842577789c9..012d1e5f1524 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
| @@ -71,13 +71,13 @@ static char *state_names[] = { | |||
| 71 | static int lh7a40x_ep_enable(struct usb_ep *ep, | 71 | static int lh7a40x_ep_enable(struct usb_ep *ep, |
| 72 | const struct usb_endpoint_descriptor *); | 72 | const struct usb_endpoint_descriptor *); |
| 73 | static int lh7a40x_ep_disable(struct usb_ep *ep); | 73 | static int lh7a40x_ep_disable(struct usb_ep *ep); |
| 74 | static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, int); | 74 | static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, gfp_t); |
| 75 | static void lh7a40x_free_request(struct usb_ep *ep, struct usb_request *); | 75 | static void lh7a40x_free_request(struct usb_ep *ep, struct usb_request *); |
| 76 | static void *lh7a40x_alloc_buffer(struct usb_ep *ep, unsigned, dma_addr_t *, | 76 | static void *lh7a40x_alloc_buffer(struct usb_ep *ep, unsigned, dma_addr_t *, |
| 77 | int); | 77 | gfp_t); |
| 78 | static void lh7a40x_free_buffer(struct usb_ep *ep, void *, dma_addr_t, | 78 | static void lh7a40x_free_buffer(struct usb_ep *ep, void *, dma_addr_t, |
| 79 | unsigned); | 79 | unsigned); |
| 80 | static int lh7a40x_queue(struct usb_ep *ep, struct usb_request *, int); | 80 | static int lh7a40x_queue(struct usb_ep *ep, struct usb_request *, gfp_t); |
| 81 | static int lh7a40x_dequeue(struct usb_ep *ep, struct usb_request *); | 81 | static int lh7a40x_dequeue(struct usb_ep *ep, struct usb_request *); |
| 82 | static int lh7a40x_set_halt(struct usb_ep *ep, int); | 82 | static int lh7a40x_set_halt(struct usb_ep *ep, int); |
| 83 | static int lh7a40x_fifo_status(struct usb_ep *ep); | 83 | static int lh7a40x_fifo_status(struct usb_ep *ep); |
| @@ -1106,7 +1106,7 @@ static int lh7a40x_ep_disable(struct usb_ep *_ep) | |||
| 1106 | } | 1106 | } |
| 1107 | 1107 | ||
| 1108 | static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, | 1108 | static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, |
| 1109 | unsigned gfp_flags) | 1109 | gfp_t gfp_flags) |
| 1110 | { | 1110 | { |
| 1111 | struct lh7a40x_request *req; | 1111 | struct lh7a40x_request *req; |
| 1112 | 1112 | ||
| @@ -1134,7 +1134,7 @@ static void lh7a40x_free_request(struct usb_ep *ep, struct usb_request *_req) | |||
| 1134 | } | 1134 | } |
| 1135 | 1135 | ||
| 1136 | static void *lh7a40x_alloc_buffer(struct usb_ep *ep, unsigned bytes, | 1136 | static void *lh7a40x_alloc_buffer(struct usb_ep *ep, unsigned bytes, |
| 1137 | dma_addr_t * dma, unsigned gfp_flags) | 1137 | dma_addr_t * dma, gfp_t gfp_flags) |
| 1138 | { | 1138 | { |
| 1139 | char *retval; | 1139 | char *retval; |
| 1140 | 1140 | ||
| @@ -1158,7 +1158,7 @@ static void lh7a40x_free_buffer(struct usb_ep *ep, void *buf, dma_addr_t dma, | |||
| 1158 | * NOTE: Sets INDEX register | 1158 | * NOTE: Sets INDEX register |
| 1159 | */ | 1159 | */ |
| 1160 | static int lh7a40x_queue(struct usb_ep *_ep, struct usb_request *_req, | 1160 | static int lh7a40x_queue(struct usb_ep *_ep, struct usb_request *_req, |
| 1161 | unsigned gfp_flags) | 1161 | gfp_t gfp_flags) |
| 1162 | { | 1162 | { |
| 1163 | struct lh7a40x_request *req; | 1163 | struct lh7a40x_request *req; |
| 1164 | struct lh7a40x_ep *ep; | 1164 | struct lh7a40x_ep *ep; |
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 477fab2e74d1..c32e1f7476da 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
| @@ -376,7 +376,7 @@ static int net2280_disable (struct usb_ep *_ep) | |||
| 376 | /*-------------------------------------------------------------------------*/ | 376 | /*-------------------------------------------------------------------------*/ |
| 377 | 377 | ||
| 378 | static struct usb_request * | 378 | static struct usb_request * |
| 379 | net2280_alloc_request (struct usb_ep *_ep, unsigned gfp_flags) | 379 | net2280_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags) |
| 380 | { | 380 | { |
| 381 | struct net2280_ep *ep; | 381 | struct net2280_ep *ep; |
| 382 | struct net2280_request *req; | 382 | struct net2280_request *req; |
| @@ -463,7 +463,7 @@ net2280_alloc_buffer ( | |||
| 463 | struct usb_ep *_ep, | 463 | struct usb_ep *_ep, |
| 464 | unsigned bytes, | 464 | unsigned bytes, |
| 465 | dma_addr_t *dma, | 465 | dma_addr_t *dma, |
| 466 | unsigned gfp_flags | 466 | gfp_t gfp_flags |
| 467 | ) | 467 | ) |
| 468 | { | 468 | { |
| 469 | void *retval; | 469 | void *retval; |
| @@ -897,7 +897,7 @@ done (struct net2280_ep *ep, struct net2280_request *req, int status) | |||
| 897 | /*-------------------------------------------------------------------------*/ | 897 | /*-------------------------------------------------------------------------*/ |
| 898 | 898 | ||
| 899 | static int | 899 | static int |
| 900 | net2280_queue (struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags) | 900 | net2280_queue (struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) |
| 901 | { | 901 | { |
| 902 | struct net2280_request *req; | 902 | struct net2280_request *req; |
| 903 | struct net2280_ep *ep; | 903 | struct net2280_ep *ep; |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index ff5533e69560..b7885dc0f42f 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
| @@ -269,7 +269,7 @@ static int omap_ep_disable(struct usb_ep *_ep) | |||
| 269 | /*-------------------------------------------------------------------------*/ | 269 | /*-------------------------------------------------------------------------*/ |
| 270 | 270 | ||
| 271 | static struct usb_request * | 271 | static struct usb_request * |
| 272 | omap_alloc_request(struct usb_ep *ep, unsigned gfp_flags) | 272 | omap_alloc_request(struct usb_ep *ep, gfp_t gfp_flags) |
| 273 | { | 273 | { |
| 274 | struct omap_req *req; | 274 | struct omap_req *req; |
| 275 | 275 | ||
| @@ -298,7 +298,7 @@ omap_alloc_buffer( | |||
| 298 | struct usb_ep *_ep, | 298 | struct usb_ep *_ep, |
| 299 | unsigned bytes, | 299 | unsigned bytes, |
| 300 | dma_addr_t *dma, | 300 | dma_addr_t *dma, |
| 301 | unsigned gfp_flags | 301 | gfp_t gfp_flags |
| 302 | ) | 302 | ) |
| 303 | { | 303 | { |
| 304 | void *retval; | 304 | void *retval; |
| @@ -937,7 +937,7 @@ static void dma_channel_release(struct omap_ep *ep) | |||
| 937 | /*-------------------------------------------------------------------------*/ | 937 | /*-------------------------------------------------------------------------*/ |
| 938 | 938 | ||
| 939 | static int | 939 | static int |
| 940 | omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags) | 940 | omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) |
| 941 | { | 941 | { |
| 942 | struct omap_ep *ep = container_of(_ep, struct omap_ep, ep); | 942 | struct omap_ep *ep = container_of(_ep, struct omap_ep, ep); |
| 943 | struct omap_req *req = container_of(_req, struct omap_req, req); | 943 | struct omap_req *req = container_of(_req, struct omap_req, req); |
| @@ -2909,12 +2909,10 @@ static int __exit omap_udc_remove(struct device *dev) | |||
| 2909 | * may involve talking to an external transceiver (e.g. isp1301). | 2909 | * may involve talking to an external transceiver (e.g. isp1301). |
| 2910 | */ | 2910 | */ |
| 2911 | 2911 | ||
| 2912 | static int omap_udc_suspend(struct device *dev, pm_message_t message, u32 level) | 2912 | static int omap_udc_suspend(struct device *dev, pm_message_t message) |
| 2913 | { | 2913 | { |
| 2914 | u32 devstat; | 2914 | u32 devstat; |
| 2915 | 2915 | ||
| 2916 | if (level != SUSPEND_POWER_DOWN) | ||
| 2917 | return 0; | ||
| 2918 | devstat = UDC_DEVSTAT_REG; | 2916 | devstat = UDC_DEVSTAT_REG; |
| 2919 | 2917 | ||
| 2920 | /* we're requesting 48 MHz clock if the pullup is enabled | 2918 | /* we're requesting 48 MHz clock if the pullup is enabled |
| @@ -2931,11 +2929,8 @@ static int omap_udc_suspend(struct device *dev, pm_message_t message, u32 level) | |||
| 2931 | return 0; | 2929 | return 0; |
| 2932 | } | 2930 | } |
| 2933 | 2931 | ||
| 2934 | static int omap_udc_resume(struct device *dev, u32 level) | 2932 | static int omap_udc_resume(struct device *dev) |
| 2935 | { | 2933 | { |
| 2936 | if (level != RESUME_POWER_ON) | ||
| 2937 | return 0; | ||
| 2938 | |||
| 2939 | DBG("resume + wakeup/SRP\n"); | 2934 | DBG("resume + wakeup/SRP\n"); |
| 2940 | omap_pullup(&udc->gadget, 1); | 2935 | omap_pullup(&udc->gadget, 1); |
| 2941 | 2936 | ||
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index 73f8c9404156..647028590b23 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
| @@ -332,7 +332,7 @@ static int pxa2xx_ep_disable (struct usb_ep *_ep) | |||
| 332 | * pxa2xx_ep_alloc_request - allocate a request data structure | 332 | * pxa2xx_ep_alloc_request - allocate a request data structure |
| 333 | */ | 333 | */ |
| 334 | static struct usb_request * | 334 | static struct usb_request * |
| 335 | pxa2xx_ep_alloc_request (struct usb_ep *_ep, unsigned gfp_flags) | 335 | pxa2xx_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags) |
| 336 | { | 336 | { |
| 337 | struct pxa2xx_request *req; | 337 | struct pxa2xx_request *req; |
| 338 | 338 | ||
| @@ -367,7 +367,7 @@ pxa2xx_ep_free_request (struct usb_ep *_ep, struct usb_request *_req) | |||
| 367 | */ | 367 | */ |
| 368 | static void * | 368 | static void * |
| 369 | pxa2xx_ep_alloc_buffer(struct usb_ep *_ep, unsigned bytes, | 369 | pxa2xx_ep_alloc_buffer(struct usb_ep *_ep, unsigned bytes, |
| 370 | dma_addr_t *dma, unsigned gfp_flags) | 370 | dma_addr_t *dma, gfp_t gfp_flags) |
| 371 | { | 371 | { |
| 372 | char *retval; | 372 | char *retval; |
| 373 | 373 | ||
| @@ -422,7 +422,7 @@ static inline void ep0_idle (struct pxa2xx_udc *dev) | |||
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | static int | 424 | static int |
| 425 | write_packet(volatile unsigned long *uddr, struct pxa2xx_request *req, unsigned max) | 425 | write_packet(volatile u32 *uddr, struct pxa2xx_request *req, unsigned max) |
| 426 | { | 426 | { |
| 427 | u8 *buf; | 427 | u8 *buf; |
| 428 | unsigned length, count; | 428 | unsigned length, count; |
| @@ -874,7 +874,7 @@ done: | |||
| 874 | /*-------------------------------------------------------------------------*/ | 874 | /*-------------------------------------------------------------------------*/ |
| 875 | 875 | ||
| 876 | static int | 876 | static int |
| 877 | pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags) | 877 | pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) |
| 878 | { | 878 | { |
| 879 | struct pxa2xx_request *req; | 879 | struct pxa2xx_request *req; |
| 880 | struct pxa2xx_ep *ep; | 880 | struct pxa2xx_ep *ep; |
| @@ -2602,24 +2602,23 @@ static int __exit pxa2xx_udc_remove(struct device *_dev) | |||
| 2602 | * VBUS IRQs should probably be ignored so that the PXA device just acts | 2602 | * VBUS IRQs should probably be ignored so that the PXA device just acts |
| 2603 | * "dead" to USB hosts until system resume. | 2603 | * "dead" to USB hosts until system resume. |
| 2604 | */ | 2604 | */ |
| 2605 | static int pxa2xx_udc_suspend(struct device *dev, pm_message_t state, u32 level) | 2605 | static int pxa2xx_udc_suspend(struct device *dev, pm_message_t state) |
| 2606 | { | 2606 | { |
| 2607 | struct pxa2xx_udc *udc = dev_get_drvdata(dev); | 2607 | struct pxa2xx_udc *udc = dev_get_drvdata(dev); |
| 2608 | 2608 | ||
| 2609 | if (level == SUSPEND_POWER_DOWN) { | 2609 | if (!udc->mach->udc_command) |
| 2610 | if (!udc->mach->udc_command) | 2610 | WARN("USB host won't detect disconnect!\n"); |
| 2611 | WARN("USB host won't detect disconnect!\n"); | 2611 | pullup(udc, 0); |
| 2612 | pullup(udc, 0); | 2612 | |
| 2613 | } | ||
| 2614 | return 0; | 2613 | return 0; |
| 2615 | } | 2614 | } |
| 2616 | 2615 | ||
| 2617 | static int pxa2xx_udc_resume(struct device *dev, u32 level) | 2616 | static int pxa2xx_udc_resume(struct device *dev) |
| 2618 | { | 2617 | { |
| 2619 | struct pxa2xx_udc *udc = dev_get_drvdata(dev); | 2618 | struct pxa2xx_udc *udc = dev_get_drvdata(dev); |
| 2620 | 2619 | ||
| 2621 | if (level == RESUME_POWER_ON) | 2620 | pullup(udc, 1); |
| 2622 | pullup(udc, 1); | 2621 | |
| 2623 | return 0; | 2622 | return 0; |
| 2624 | } | 2623 | } |
| 2625 | 2624 | ||
diff --git a/drivers/usb/gadget/pxa2xx_udc.h b/drivers/usb/gadget/pxa2xx_udc.h index a58f3e6e71f1..19a883f7d1b8 100644 --- a/drivers/usb/gadget/pxa2xx_udc.h +++ b/drivers/usb/gadget/pxa2xx_udc.h | |||
| @@ -69,11 +69,11 @@ struct pxa2xx_ep { | |||
| 69 | * UDDR = UDC Endpoint Data Register (the fifo) | 69 | * UDDR = UDC Endpoint Data Register (the fifo) |
| 70 | * DRCM = DMA Request Channel Map | 70 | * DRCM = DMA Request Channel Map |
| 71 | */ | 71 | */ |
| 72 | volatile unsigned long *reg_udccs; | 72 | volatile u32 *reg_udccs; |
| 73 | volatile unsigned long *reg_ubcr; | 73 | volatile u32 *reg_ubcr; |
| 74 | volatile unsigned long *reg_uddr; | 74 | volatile u32 *reg_uddr; |
| 75 | #ifdef USE_DMA | 75 | #ifdef USE_DMA |
| 76 | volatile unsigned long *reg_drcmr; | 76 | volatile u32 *reg_drcmr; |
| 77 | #define drcmr(n) .reg_drcmr = & DRCMR ## n , | 77 | #define drcmr(n) .reg_drcmr = & DRCMR ## n , |
| 78 | #else | 78 | #else |
| 79 | #define drcmr(n) | 79 | #define drcmr(n) |
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c index c925d9222f53..b35ac6d334f8 100644 --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c | |||
| @@ -300,18 +300,18 @@ static int gs_build_config_buf(u8 *buf, enum usb_device_speed speed, | |||
| 300 | u8 type, unsigned int index, int is_otg); | 300 | u8 type, unsigned int index, int is_otg); |
| 301 | 301 | ||
| 302 | static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len, | 302 | static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len, |
| 303 | unsigned kmalloc_flags); | 303 | gfp_t kmalloc_flags); |
| 304 | static void gs_free_req(struct usb_ep *ep, struct usb_request *req); | 304 | static void gs_free_req(struct usb_ep *ep, struct usb_request *req); |
| 305 | 305 | ||
| 306 | static struct gs_req_entry *gs_alloc_req_entry(struct usb_ep *ep, unsigned len, | 306 | static struct gs_req_entry *gs_alloc_req_entry(struct usb_ep *ep, unsigned len, |
| 307 | unsigned kmalloc_flags); | 307 | gfp_t kmalloc_flags); |
| 308 | static void gs_free_req_entry(struct usb_ep *ep, struct gs_req_entry *req); | 308 | static void gs_free_req_entry(struct usb_ep *ep, struct gs_req_entry *req); |
| 309 | 309 | ||
| 310 | static int gs_alloc_ports(struct gs_dev *dev, unsigned kmalloc_flags); | 310 | static int gs_alloc_ports(struct gs_dev *dev, gfp_t kmalloc_flags); |
| 311 | static void gs_free_ports(struct gs_dev *dev); | 311 | static void gs_free_ports(struct gs_dev *dev); |
| 312 | 312 | ||
| 313 | /* circular buffer */ | 313 | /* circular buffer */ |
| 314 | static struct gs_buf *gs_buf_alloc(unsigned int size, unsigned kmalloc_flags); | 314 | static struct gs_buf *gs_buf_alloc(unsigned int size, gfp_t kmalloc_flags); |
| 315 | static void gs_buf_free(struct gs_buf *gb); | 315 | static void gs_buf_free(struct gs_buf *gb); |
| 316 | static void gs_buf_clear(struct gs_buf *gb); | 316 | static void gs_buf_clear(struct gs_buf *gb); |
| 317 | static unsigned int gs_buf_data_avail(struct gs_buf *gb); | 317 | 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, | |||
| 2091 | * usb_request or NULL if there is an error. | 2091 | * usb_request or NULL if there is an error. |
| 2092 | */ | 2092 | */ |
| 2093 | static struct usb_request * | 2093 | static struct usb_request * |
| 2094 | gs_alloc_req(struct usb_ep *ep, unsigned int len, unsigned kmalloc_flags) | 2094 | gs_alloc_req(struct usb_ep *ep, unsigned int len, gfp_t kmalloc_flags) |
| 2095 | { | 2095 | { |
| 2096 | struct usb_request *req; | 2096 | struct usb_request *req; |
| 2097 | 2097 | ||
| @@ -2132,7 +2132,7 @@ static void gs_free_req(struct usb_ep *ep, struct usb_request *req) | |||
| 2132 | * endpoint, buffer len, and kmalloc flags. | 2132 | * endpoint, buffer len, and kmalloc flags. |
| 2133 | */ | 2133 | */ |
| 2134 | static struct gs_req_entry * | 2134 | static struct gs_req_entry * |
| 2135 | gs_alloc_req_entry(struct usb_ep *ep, unsigned len, unsigned kmalloc_flags) | 2135 | gs_alloc_req_entry(struct usb_ep *ep, unsigned len, gfp_t kmalloc_flags) |
| 2136 | { | 2136 | { |
| 2137 | struct gs_req_entry *req; | 2137 | struct gs_req_entry *req; |
| 2138 | 2138 | ||
| @@ -2173,7 +2173,7 @@ static void gs_free_req_entry(struct usb_ep *ep, struct gs_req_entry *req) | |||
| 2173 | * | 2173 | * |
| 2174 | * The device lock is normally held when calling this function. | 2174 | * The device lock is normally held when calling this function. |
| 2175 | */ | 2175 | */ |
| 2176 | static int gs_alloc_ports(struct gs_dev *dev, unsigned kmalloc_flags) | 2176 | static int gs_alloc_ports(struct gs_dev *dev, gfp_t kmalloc_flags) |
| 2177 | { | 2177 | { |
| 2178 | int i; | 2178 | int i; |
| 2179 | struct gs_port *port; | 2179 | struct gs_port *port; |
| @@ -2255,7 +2255,7 @@ static void gs_free_ports(struct gs_dev *dev) | |||
| 2255 | * | 2255 | * |
| 2256 | * Allocate a circular buffer and all associated memory. | 2256 | * Allocate a circular buffer and all associated memory. |
| 2257 | */ | 2257 | */ |
| 2258 | static struct gs_buf *gs_buf_alloc(unsigned int size, unsigned kmalloc_flags) | 2258 | static struct gs_buf *gs_buf_alloc(unsigned int size, gfp_t kmalloc_flags) |
| 2259 | { | 2259 | { |
| 2260 | struct gs_buf *gb; | 2260 | struct gs_buf *gb; |
| 2261 | 2261 | ||
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index 6890e773b2a2..ec9c424f1d97 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c | |||
| @@ -612,7 +612,7 @@ static void source_sink_complete (struct usb_ep *ep, struct usb_request *req) | |||
| 612 | } | 612 | } |
| 613 | 613 | ||
| 614 | static struct usb_request * | 614 | static struct usb_request * |
| 615 | source_sink_start_ep (struct usb_ep *ep, unsigned gfp_flags) | 615 | source_sink_start_ep (struct usb_ep *ep, gfp_t gfp_flags) |
| 616 | { | 616 | { |
| 617 | struct usb_request *req; | 617 | struct usb_request *req; |
| 618 | int status; | 618 | int status; |
| @@ -640,7 +640,7 @@ source_sink_start_ep (struct usb_ep *ep, unsigned gfp_flags) | |||
| 640 | } | 640 | } |
| 641 | 641 | ||
| 642 | static int | 642 | static int |
| 643 | set_source_sink_config (struct zero_dev *dev, unsigned gfp_flags) | 643 | set_source_sink_config (struct zero_dev *dev, gfp_t gfp_flags) |
| 644 | { | 644 | { |
| 645 | int result = 0; | 645 | int result = 0; |
| 646 | struct usb_ep *ep; | 646 | struct usb_ep *ep; |
| @@ -744,7 +744,7 @@ static void loopback_complete (struct usb_ep *ep, struct usb_request *req) | |||
| 744 | } | 744 | } |
| 745 | 745 | ||
| 746 | static int | 746 | static int |
| 747 | set_loopback_config (struct zero_dev *dev, unsigned gfp_flags) | 747 | set_loopback_config (struct zero_dev *dev, gfp_t gfp_flags) |
| 748 | { | 748 | { |
| 749 | int result = 0; | 749 | int result = 0; |
| 750 | struct usb_ep *ep; | 750 | struct usb_ep *ep; |
| @@ -845,7 +845,7 @@ static void zero_reset_config (struct zero_dev *dev) | |||
| 845 | * by limiting configuration choices (like the pxa2xx). | 845 | * by limiting configuration choices (like the pxa2xx). |
| 846 | */ | 846 | */ |
| 847 | static int | 847 | static int |
| 848 | zero_set_config (struct zero_dev *dev, unsigned number, unsigned gfp_flags) | 848 | zero_set_config (struct zero_dev *dev, unsigned number, gfp_t gfp_flags) |
| 849 | { | 849 | { |
| 850 | int result = 0; | 850 | int result = 0; |
| 851 | struct usb_gadget *gadget = dev->gadget; | 851 | struct usb_gadget *gadget = dev->gadget; |
