usb: gadget: atmel_usba_udc: simplify setting of interrupt-enabled mask

This patch adds set and clear functions for enabling/disabling
interrupts.  This simplifies the implementation a bit as the masking of
previously set bits doesn't need to be so explicit.

Signed-off-by: Jonas Bonn <jonas@norrbonn.se>
CC: Cristian Birsan <cristian.birsan@microchip.com>
CC: Felipe Balbi <balbi@kernel.org>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Nicolas Ferre <nicolas.ferre@microchip.com>
CC: Alexandre Belloni <alexandre.belloni@bootlin.com>
CC: Ludovic Desroches <ludovic.desroches@microchip.com>
CC: linux-arm-kernel@lists.infradead.org
CC: linux-usb@vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 660712e..9a7901c 100644 (file)
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -358,8 +358,20 @@ static inline u32 usba_int_enb_get(struct usba_udc *udc)
        return udc->int_enb_cache;
 }
 
-static inline void usba_int_enb_set(struct usba_udc *udc, u32 val)
+static inline void usba_int_enb_set(struct usba_udc *udc, u32 mask)
 {
+       u32 val;
+
+       val = udc->int_enb_cache | mask;
+       usba_writel(udc, INT_ENB, val);
+       udc->int_enb_cache = val;
+}
+
+static inline void usba_int_enb_clear(struct usba_udc *udc, u32 mask)
+{
+       u32 val;
+
+       val = udc->int_enb_cache & ~mask;
        usba_writel(udc, INT_ENB, val);
        udc->int_enb_cache = val;
 }
@@ -629,14 +641,12 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
        if (ep->can_dma) {
                u32 ctrl;
 
-               usba_int_enb_set(udc, usba_int_enb_get(udc) |
-                                     USBA_BF(EPT_INT, 1 << ep->index) |
+               usba_int_enb_set(udc, USBA_BF(EPT_INT, 1 << ep->index) |
                                      USBA_BF(DMA_INT, 1 << ep->index));
                ctrl = USBA_AUTO_VALID | USBA_INTDIS_DMA;
                usba_ep_writel(ep, CTL_ENB, ctrl);
        } else {
-               usba_int_enb_set(udc, usba_int_enb_get(udc) |
-                                     USBA_BF(EPT_INT, 1 << ep->index));
+               usba_int_enb_set(udc, USBA_BF(EPT_INT, 1 << ep->index));
        }
 
        spin_unlock_irqrestore(&udc->lock, flags);
@@ -680,8 +690,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
                usba_dma_readl(ep, STATUS);
        }
        usba_ep_writel(ep, CTL_DIS, USBA_EPT_ENABLE);
-       usba_int_enb_set(udc, usba_int_enb_get(udc) &
-                             ~USBA_BF(EPT_INT, 1 << ep->index));
+       usba_int_enb_clear(udc, USBA_BF(EPT_INT, 1 << ep->index));
 
        request_complete_list(ep, &req_list, -ESHUTDOWN);
 
@@ -1710,7 +1719,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
        if (status & USBA_DET_SUSPEND) {
                toggle_bias(udc, 0);
                usba_writel(udc, INT_CLR, USBA_DET_SUSPEND);
-               usba_int_enb_set(udc, int_enb | USBA_WAKE_UP);
+               usba_int_enb_set(udc, USBA_WAKE_UP);
                udc->bias_pulse_needed = true;
                DBG(DBG_BUS, "Suspend detected\n");
                if (udc->gadget.speed != USB_SPEED_UNKNOWN
@@ -1724,7 +1733,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
        if (status & USBA_WAKE_UP) {
                toggle_bias(udc, 1);
                usba_writel(udc, INT_CLR, USBA_WAKE_UP);
-               usba_int_enb_set(udc, int_enb & ~USBA_WAKE_UP);
+               usba_int_enb_clear(udc, USBA_WAKE_UP);
                DBG(DBG_BUS, "Wake Up CPU detected\n");
        }
 
@@ -1793,7 +1802,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
                                | USBA_BF(BK_NUMBER, USBA_BK_NUMBER_ONE)));
                usba_ep_writel(ep0, CTL_ENB,
                                USBA_EPT_ENABLE | USBA_RX_SETUP);
-               usba_int_enb_set(udc, int_enb | USBA_BF(EPT_INT, 1) |
+               usba_int_enb_set(udc, USBA_BF(EPT_INT, 1) |
                                      USBA_DET_SUSPEND | USBA_END_OF_RESUME);
 
                /*