usb: gadget: net2280: remove fiforegs as it is unused

[cascardo/linux.git] / drivers / usb / gadget / udc / net2280.c

diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index d2c0bf6..d51430f 100644 (file)
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -80,6 +80,13 @@ static const char *const ep_name[] = {
        "ep-e", "ep-f", "ep-g", "ep-h",
 };
 
+/* Endpoint names for usb3380 advance mode */
+static const char *const ep_name_adv[] = {
+       ep0name,
+       "ep1in", "ep2out", "ep3in", "ep4out",
+       "ep1out", "ep2in", "ep3out", "ep4in",
+};
+
 /* mode 0 == ep-{a,b,c,d} 1K fifo each
  * mode 1 == ep-{a,b} 2K fifo each, ep-{c,d} unavailable
  * mode 2 == ep-a 2K fifo, ep-{b,c} 1K each, ep-d unavailable
@@ -1977,7 +1984,7 @@ static void usb_reinit_338x(struct net2280 *dev)
        for (i = 0; i < dev->n_ep; i++) {
                struct net2280_ep *ep = &dev->ep[i];
 
-               ep->ep.name = ep_name[i];
+               ep->ep.name = dev->enhanced_mode ? ep_name_adv[i] : ep_name[i];
                ep->dev = dev;
                ep->num = i;
 
@@ -1989,11 +1996,9 @@ static void usb_reinit_338x(struct net2280 *dev)
                        ep->regs = (struct net2280_ep_regs __iomem *)
                                (((void __iomem *)&dev->epregs[ne[i]]) +
                                ep_reg_addr[i]);
-                       ep->fiforegs = &dev->fiforegs[i];
                } else {
                        ep->cfg = &dev->epregs[i];
                        ep->regs = &dev->epregs[i];
-                       ep->fiforegs = &dev->fiforegs[i];
                }
 
                ep->fifo_size = (i != 0) ? 2048 : 512;
@@ -3373,8 +3378,6 @@ static int net2280_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                u32 usbstat;
                dev->usb_ext = (struct usb338x_usb_ext_regs __iomem *)
                                                        (base + 0x00b4);
-               dev->fiforegs = (struct usb338x_fifo_regs __iomem *)
-                                                       (base + 0x0500);
                dev->llregs = (struct usb338x_ll_regs __iomem *)
                                                        (base + 0x0700);
                dev->ll_lfps_regs = (struct usb338x_ll_lfps_regs __iomem *)