usb: host: xhci: purge GET_MAX_PACKET()

usb_endpoint_maxp() is now returning maxpacket
correctly - iow only bits 10:0. We can finaly remove
XHCI's private GET_MAX_PACKET macro.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 679672da58ed9dbc73e9473abb7d9b8d385d8041..48a26d378ef8f21bdf7ab08ebc58fbf6fcf1dcf3 100644 (file)
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1415,7 +1415,7 @@ static u32 xhci_get_max_esit_payload(struct usb_device *udev,
        else if (udev->speed >= USB_SPEED_SUPER)
                return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval);
 
-       max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc));
+       max_packet = usb_endpoint_maxp(&ep->desc);
        max_burst = usb_endpoint_maxp_mult(&ep->desc);
        /* A 0 in max burst means 1 transfer per ESIT */
        return max_packet * max_burst;
@@ -1461,7 +1461,7 @@ int xhci_endpoint_init(struct xhci_hcd *xhci,
        max_esit_payload = xhci_get_max_esit_payload(udev, ep);
        interval = xhci_get_endpoint_interval(udev, ep);
        mult = xhci_get_endpoint_mult(udev, ep);
-       max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc));
+       max_packet = usb_endpoint_maxp(&ep->desc);
        max_burst = xhci_get_endpoint_max_burst(udev, ep);
        avg_trb_len = max_esit_payload;
 

diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c
index 73f763c4f5f591a2c19053083dedf7b6aa252f31..6e7ddf6cafae14a63601f63f4c10c44e1c81c372 100644 (file)
--- a/drivers/usb/host/xhci-mtk-sch.c
+++ b/drivers/usb/host/xhci-mtk-sch.c
@@ -337,7 +337,7 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,
 
        xhci_dbg(xhci, "%s() type:%d, speed:%d, mpkt:%d, dir:%d, ep:%p\n",
                __func__, usb_endpoint_type(&ep->desc), udev->speed,
-               GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)),
+               usb_endpoint_maxp(&ep->desc),
                usb_endpoint_dir_in(&ep->desc), ep);
 
        if (!need_bw_sch(ep, udev->speed, slot_ctx->tt_info & TT_SLOT)) {
@@ -403,7 +403,7 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,
 
        xhci_dbg(xhci, "%s() type:%d, speed:%d, mpks:%d, dir:%d, ep:%p\n",
                __func__, usb_endpoint_type(&ep->desc), udev->speed,
-               GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)),
+               usb_endpoint_maxp(&ep->desc),
                usb_endpoint_dir_in(&ep->desc), ep);
 
        if (!need_bw_sch(ep, udev->speed, slot_ctx->tt_info & TT_SLOT))

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 797137e26549b566474d99e1d3e6efe277aa4648..d4159117ceff19bf1d5e9a95e07e57ad1e10fb44 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -3120,7 +3120,7 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred,
        if (xhci->quirks & XHCI_MTK_HOST)
                trb_buff_len = 0;
 
-       maxp = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));
+       maxp = usb_endpoint_maxp(&urb->ep->desc);
        total_packet_count = DIV_ROUND_UP(td_total_len, maxp);
 
        /* Queueing functions don't count the current TRB into transferred */
@@ -3136,7 +3136,7 @@ static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len,
        unsigned int max_pkt;
        u32 new_buff_len;
 
-       max_pkt = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));
+       max_pkt = usb_endpoint_maxp(&urb->ep->desc);
        unalign = (enqd_len + *trb_buff_len) % max_pkt;
 
        /* we got lucky, last normal TRB data on segment is packet aligned */
@@ -3650,7 +3650,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                addr = start_addr + urb->iso_frame_desc[i].offset;
                td_len = urb->iso_frame_desc[i].length;
                td_remain_len = td_len;
-               max_pkt = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));
+               max_pkt = usb_endpoint_maxp(&urb->ep->desc);
                total_pkt_count = DIV_ROUND_UP(td_len, max_pkt);
 
                /* A zero-length transfer still involves at least one packet. */

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 1a4ca02729c274cb83762636e5556ca75e840144..cf30cb696e754e84f143291c91cda6f84e0e38cf 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3209,7 +3209,7 @@ int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
 
        for (i = 0; i < num_eps; i++) {
                ep_index = xhci_get_endpoint_index(&eps[i]->desc);
-               max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&eps[i]->desc));
+               max_packet = usb_endpoint_maxp(&eps[i]->desc);
                vdev->eps[ep_index].stream_info = xhci_alloc_stream_info(xhci,
                                num_stream_ctxs,
                                num_streams,

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index f945380035d07e2f7af2bb73da9d39bf94475991..3e5922dcc2f97b8dcbdf0a85555184d66bdc2bac 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -747,11 +747,6 @@ struct xhci_ep_ctx {
 #define MAX_PACKET_MASK                (0xffff << 16)
 #define MAX_PACKET_DECODED(p)  (((p) >> 16) & 0xffff)
 
-/* Get max packet size from ep desc. Bit 10..0 specify the max packet size.
- * USB2.0 spec 9.6.6.
- */
-#define GET_MAX_PACKET(p)      ((p) & 0x7ff)
-
 /* tx_info bitmasks */
 #define EP_AVG_TRB_LENGTH(p)           ((p) & 0xffff)
 #define EP_MAX_ESIT_PAYLOAD_LO(p)      (((p) & 0xffff) << 16)