tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

usb: gadget: udc: atmel: Remove unnecessary macros

commit 46ddd79e893b ("usb: gadget: udc: atmel: Remove AVR32 bits from the
driver") left the accessor macros introduced by commit a3dd3befd7cb ("usb:
gadget: atmel_usba: use endian agnostic IO on ARM"). They can now be
removed.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

authored by

Alexandre Belloni and committed by
Felipe Balbi d423b965 c8e4e5bd

+8 -12
+2 -2
drivers/usb/gadget/udc/atmel_usba_udc.c
··· 152 152 153 153 spin_lock_irq(&udc->lock); 154 154 for (i = 0; i < inode->i_size / 4; i++) 155 - data[i] = usba_io_readl(udc->regs + i * 4); 155 + data[i] = readl_relaxed(udc->regs + i * 4); 156 156 spin_unlock_irq(&udc->lock); 157 157 158 158 file->private_data = data; ··· 1369 1369 if (crq->wLength != cpu_to_le16(sizeof(status))) 1370 1370 goto stall; 1371 1371 ep->state = DATA_STAGE_IN; 1372 - usba_io_writew(status, ep->fifo); 1372 + writew_relaxed(status, ep->fifo); 1373 1373 usba_ep_writel(ep, SET_STA, USBA_TX_PK_RDY); 1374 1374 break; 1375 1375 }
+6 -10
drivers/usb/gadget/udc/atmel_usba_udc.h
··· 186 186 | USBA_BF(name, value)) 187 187 188 188 /* Register access macros */ 189 - #define usba_io_readl readl_relaxed 190 - #define usba_io_writel writel_relaxed 191 - #define usba_io_writew writew_relaxed 192 - 193 189 #define usba_readl(udc, reg) \ 194 - usba_io_readl((udc)->regs + USBA_##reg) 190 + readl_relaxed((udc)->regs + USBA_##reg) 195 191 #define usba_writel(udc, reg, value) \ 196 - usba_io_writel((value), (udc)->regs + USBA_##reg) 192 + writel_relaxed((value), (udc)->regs + USBA_##reg) 197 193 #define usba_ep_readl(ep, reg) \ 198 - usba_io_readl((ep)->ep_regs + USBA_EPT_##reg) 194 + readl_relaxed((ep)->ep_regs + USBA_EPT_##reg) 199 195 #define usba_ep_writel(ep, reg, value) \ 200 - usba_io_writel((value), (ep)->ep_regs + USBA_EPT_##reg) 196 + writel_relaxed((value), (ep)->ep_regs + USBA_EPT_##reg) 201 197 #define usba_dma_readl(ep, reg) \ 202 - usba_io_readl((ep)->dma_regs + USBA_DMA_##reg) 198 + readl_relaxed((ep)->dma_regs + USBA_DMA_##reg) 203 199 #define usba_dma_writel(ep, reg, value) \ 204 - usba_io_writel((value), (ep)->dma_regs + USBA_DMA_##reg) 200 + writel_relaxed((value), (ep)->dma_regs + USBA_DMA_##reg) 205 201 206 202 /* Calculate base address for a given endpoint or DMA controller */ 207 203 #define USBA_EPT_BASE(x) (0x100 + (x) * 0x20)