9 files changed, 20 insertions, 20 deletions

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index b948ffd94f45..f5eb9e7b5b18 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -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;
diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c
index 5c38ad869485..91c2ab43cbcc 100644
--- a/drivers/usb/host/ehci-mem.c
+++ b/drivers/usb/host/ehci-mem.c
@@ -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, int 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, int 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, int flags)
+static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
 {
         int i;
 
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 940d38ca7d91..5bb872c3496d 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -477,7 +477,7 @@ qh_urb_transaction (
         struct ehci_hcd         *ehci,
         struct urb              *urb,
         struct list_head        *head,
-        int                     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,
-        int                     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;
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index ccc7300baa6d..f0c8aa1ccd5d 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -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;
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index e142056b0d2c..2548d94fcd72 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -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;
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 67c1aa5eb1c1..f8da8c7af7c6 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -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;
diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c
index fd3c4d3714bd..9fb83dfb1eb4 100644
--- a/drivers/usb/host/ohci-mem.c
+++ b/drivers/usb/host/ohci-mem.c
@@ -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 *
-ed_alloc (struct ohci_hcd *hc, unsigned mem_flags)
+ed_alloc (struct ohci_hcd *hc, gfp_t mem_flags)
 {
         dma_addr_t      dma;
         struct ed       *ed;
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index d42a15d10a46..cad858575cea 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -818,7 +818,7 @@ static int sl811h_urb_enqueue(
         struct usb_hcd          *hcd,
         struct usb_host_endpoint *hep,
         struct urb              *urb,
-        unsigned                mem_flags
+        gfp_t                   mem_flags
 ) {
         struct sl811            *sl811 = hcd_to_sl811(hcd);
         struct usb_device       *udev = urb->dev;
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index ea0d168a8c67..4e0fbe2c1a9a 100644
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -1164,7 +1164,7 @@ static struct urb *uhci_find_urb_ep(struct uhci_hcd *uhci, struct urb *urb)
 
 static int uhci_urb_enqueue(struct usb_hcd *hcd,
                 struct usb_host_endpoint *ep,
-                struct urb *urb, unsigned mem_flags)
+                struct urb *urb, gfp_t mem_flags)
 {
         int ret;
         struct uhci_hcd *uhci = hcd_to_uhci(hcd);