phonet: Replace calls to __skb_alloc_page with __dev_alloc_page

Replace the calls to __skb_alloc_page that are passed NULL with calls to
__dev_alloc_page.

In addition remove __GFP_COLD flag from allocations as we only want it for
the Rx buffer which is taken care of by __dev_alloc_skb, not for any
secondary allocations such as the queue element transmit descriptors.

Cc: Oliver Neukum <oliver@neukum.org>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 2ec1500d0077529c0fd32d74c1abeb9d5f373aa8..415ce8b882c615f08d7368cdfa7bec68bef01fa7 100644 (file)
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -130,7 +130,7 @@ static int rx_submit(struct usbpn_dev *pnd, struct urb *req, gfp_t gfp_flags)
        struct page *page;
        int err;
 
-       page = __skb_alloc_page(gfp_flags | __GFP_NOMEMALLOC, NULL);
+       page = __dev_alloc_page(gfp_flags | __GFP_NOMEMALLOC);
        if (!page)
                return -ENOMEM;
 
@@ -212,7 +212,7 @@ resubmit:
        if (page)
                put_page(page);
        if (req)
-               rx_submit(pnd, req, GFP_ATOMIC | __GFP_COLD);
+               rx_submit(pnd, req, GFP_ATOMIC);
 }
 
 static int usbpn_close(struct net_device *dev);
@@ -231,7 +231,7 @@ static int usbpn_open(struct net_device *dev)
        for (i = 0; i < rxq_size; i++) {
                struct urb *req = usb_alloc_urb(0, GFP_KERNEL);
 
-               if (!req || rx_submit(pnd, req, GFP_KERNEL | __GFP_COLD)) {
+               if (!req || rx_submit(pnd, req, GFP_KERNEL)) {
                        usb_free_urb(req);
                        usbpn_close(dev);
                        return -ENOMEM;

diff --git a/drivers/usb/gadget/function/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c
index b9cfc1571d71281c0607abf0420fb518796626fe..cde73974a52e4b0b9299ba8afea0376b2bfda2b2 100644 (file)
--- a/drivers/usb/gadget/function/f_phonet.c
+++ b/drivers/usb/gadget/function/f_phonet.c
@@ -303,7 +303,7 @@ pn_rx_submit(struct f_phonet *fp, struct usb_request *req, gfp_t gfp_flags)
        struct page *page;
        int err;
 
-       page = __skb_alloc_page(gfp_flags | __GFP_NOMEMALLOC, NULL);
+       page = __dev_alloc_page(gfp_flags | __GFP_NOMEMALLOC);
        if (!page)
                return -ENOMEM;
 
@@ -377,7 +377,7 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req)
        if (page)
                put_page(page);
        if (req)
-               pn_rx_submit(fp, req, GFP_ATOMIC | __GFP_COLD);
+               pn_rx_submit(fp, req, GFP_ATOMIC);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -437,7 +437,7 @@ static int pn_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 
                        netif_carrier_on(dev);
                        for (i = 0; i < phonet_rxq_size; i++)
-                               pn_rx_submit(fp, fp->out_reqv[i], GFP_ATOMIC | __GFP_COLD);
+                               pn_rx_submit(fp, fp->out_reqv[i], GFP_ATOMIC);
                }
                spin_unlock(&port->lock);
                return 0;