usb: gadget: remove DMA_ADDR_INVALID from f_uac2 and gadgetfs

DMA_ADDR_INVALID is used by the UDC driver and the gadgets should
provide only a buffer address. Everything else should be taken core of
by the UDC and udc-core.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/f_uac2.c b/drivers/usb/gadget/f_uac2.c
index 730a260e1841c1b65e941046f7fc15a224b565c6..86f8ac79142041d02a8f5af0d6e1f2b68bdd772e 100644 (file)
--- a/drivers/usb/gadget/f_uac2.c
+++ b/drivers/usb/gadget/f_uac2.c
@@ -50,8 +50,6 @@ static int c_ssize = 2;
 module_param(c_ssize, uint, S_IRUGO);
 MODULE_PARM_DESC(c_ssize, "Capture Sample Size(bytes)");
 
-#define DMA_ADDR_INVALID       (~(dma_addr_t)0)
-
 #define ALT_SET(x, a)  do {(x) &= ~0xff; (x) |= (a); } while (0)
 #define ALT_GET(x)     ((x) & 0xff)
 #define INTF_SET(x, i) do {(x) &= 0xff; (x) |= ((i) << 8); } while (0)
@@ -1130,7 +1128,6 @@ afunc_set_alt(struct usb_function *fn, unsigned intf, unsigned alt)
                prm->ureq[i].pp = prm;
 
                req->zero = 0;
-               req->dma = DMA_ADDR_INVALID;
                req->context = &prm->ureq[i];
                req->length = prm->max_psize;
                req->complete = agdev_iso_complete;

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 76494cabf4e46e28cb2771b1fdd3566b8e6cc5b2..8ac840f25ba9641f2939f807af8f4d768169702e 100644 (file)
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -76,7 +76,6 @@ MODULE_LICENSE ("GPL");
 /*----------------------------------------------------------------------*/
 
 #define GADGETFS_MAGIC         0xaee71ee7
-#define DMA_ADDR_INVALID       (~(dma_addr_t)0)
 
 /* /dev/gadget/$CHIP represents ep0 and the whole device */
 enum ep0_state {
@@ -918,7 +917,6 @@ static void clean_req (struct usb_ep *ep, struct usb_request *req)
        if (req->buf != dev->rbuf) {
                kfree(req->buf);
                req->buf = dev->rbuf;
-               req->dma = DMA_ADDR_INVALID;
        }
        req->complete = epio_complete;
        dev->setup_out_ready = 0;
@@ -1408,7 +1406,6 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                dev->setup_abort = 1;
 
        req->buf = dev->rbuf;
-       req->dma = DMA_ADDR_INVALID;
        req->context = NULL;
        value = -EOPNOTSUPP;
        switch (ctrl->bRequest) {