---

yaml
---
r: 338631
b: refs/heads/master
c: b7c041a
h: refs/heads/master
i:
  338629: 8367bf6
  338627: 014dce2
  338623: c126c1b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10287baec761d33f0a82d84b46e37a44030350d8
+refs/heads/master: b7c041aadad561a84d17851f69414060f8389ce1

trunk/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;

trunk/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) {