usbmon: Drop DMA mapping for setup packet

[firefly-linux-kernel-4.4.55.git] / drivers / usb / mon / mon_text.c

diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index 9d0070ceef529ee358480126f3c7d460c314f6c6..663a702a17dd8e39d37ef7e4d4e14acc999bbf68 100644 (file)
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -52,10 +52,11 @@ struct mon_event_text {
        int type;               /* submit, complete, etc. */
        unsigned long id;       /* From pointer, most of the time */
        unsigned int tstamp;
-       int xfertype;
        int busnum;
-       int devnum;
-       int epnum;
+       char devnum;
+       char epnum;
+       char is_in;
+       char xfertype;
        int length;             /* Depends on type: xfer length or act length */
        int status;
        int interval;
@@ -63,7 +64,6 @@ struct mon_event_text {
        int error_count;
        char setup_flag;
        char data_flag;
-       char is_in;
        int numdesc;            /* Full number */
        struct mon_iso_desc isodesc[ISODESC_MAX];
        unsigned char setup[SETUP_MAX];
@@ -127,10 +127,6 @@ static inline char mon_text_get_setup(struct mon_event_text *ep,
        if (ep->xfertype != USB_ENDPOINT_XFER_CONTROL || ev_type != 'S')
                return '-';
 
-       if (urb->dev->bus->uses_dma &&
-           (urb->transfer_flags & URB_NO_SETUP_DMA_MAP)) {
-               return mon_dmapeek(ep->setup, urb->setup_dma, SETUP_MAX);
-       }
        if (urb->setup_packet == NULL)
                return 'Z';     /* '0' would be not as pretty. */