Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be780381 authored by Hans de Goede's avatar Hans de Goede Committed by Felipe Balbi
Browse files

usb: musb: Do not use musb_read[b|w] / _write[b|w] wrappers in generic fifo functions 



The generic fifo functions already use non wrapped accesses in various
cases through the iowrite#_rep functions, and all platforms which override
the default musb_read[b|w] / _write[b|w] functions also provide their own
fifo access functions, so we can safely drop the unnecessary indirection
from the fifo access functions.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 6cc2af6d

drivers/usb/musb/musb_core.c

+4 −4
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static void musb_default_write_fifo(struct musb_hw_ep *hw_ep, u16 len, 
				index += len & ~0x03;

			}

			if (len & 0x02) {

				musb_writew(fifo, 0, *(u16 *)&src[index]);

				__raw_writew(*(u16 *)&src[index], fifo);

				index += 2;

			}

		} else {
@@ -324,7 +324,7 @@ static void musb_default_write_fifo(struct musb_hw_ep *hw_ep, u16 len, 
			}

		}

		if (len & 0x01)

			musb_writeb(fifo, 0, src[index]);

			__raw_writeb(src[index], fifo);

	} else  {

		/* byte aligned */

		iowrite8_rep(fifo, src, len);
@@ -356,7 +356,7 @@ static void musb_default_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst) 
				index = len & ~0x03;

			}

			if (len & 0x02) {

				*(u16 *)&dst[index] = musb_readw(fifo, 0);

				*(u16 *)&dst[index] = __raw_readw(fifo);

				index += 2;

			}

		} else {
@@ -366,7 +366,7 @@ static void musb_default_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst) 
			}

		}

		if (len & 0x01)

			dst[index] = musb_readb(fifo, 0);

			dst[index] = __raw_readb(fifo);

	} else  {

		/* byte aligned */

		ioread8_rep(fifo, dst, len);