linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: hdegoede@redhat.com (Hans de Goede)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 04/13] musb: Do not use musb_read[b|w] / _write[b|w] wrappers in generic fifo functions
Date: Fri, 20 Mar 2015 20:11:13 +0100	[thread overview]
Message-ID: <1426878682-14521-5-git-send-email-hdegoede@redhat.com> (raw)
In-Reply-To: <1426878682-14521-1-git-send-email-hdegoede@redhat.com>

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: Hans de Goede <hdegoede@redhat.com>
---
 drivers/usb/musb/musb_core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 01ed3a6..016b5b9 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -313,7 +313,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 {
@@ -323,7 +323,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);
@@ -355,7 +355,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 {
@@ -365,7 +365,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);
-- 
2.3.3

  parent reply	other threads:[~2015-03-20 19:11 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-20 19:11 [PATCH v2 00/13] musb: Add support for the Allwinner sunxi musb controller Hans de Goede
2015-03-20 19:11 ` [PATCH v2 01/13] phy-sun4i-usb: Add full support for usb0 phy / OTG Hans de Goede
2015-03-20 19:11 ` [PATCH v2 02/13] musb: Make musb_write_rxfun* and musb_write_rxhub* work like their tx versions Hans de Goede
2015-03-20 19:11 ` [PATCH v2 03/13] musb: Make busctl_offset an io-op rather then a define Hans de Goede
2015-03-20 19:11 ` Hans de Goede [this message]
2015-05-11 15:58   ` [PATCH v2 04/13] musb: Do not use musb_read[b|w] / _write[b|w] wrappers in generic fifo functions Felipe Balbi
2015-05-11 16:21     ` Arnd Bergmann
2015-05-11 18:14     ` [linux-sunxi] " Hans de Goede
2015-05-11 18:53       ` Arnd Bergmann
2015-05-11 19:11         ` Hans de Goede
2015-03-20 19:11 ` [PATCH v2 05/13] musb: Fix platform code being unable to override ep access ops Hans de Goede
2015-03-20 19:11 ` [PATCH v2 06/13] musb: Add support for the Allwinner sunxi musb controller Hans de Goede
2015-03-21  2:04   ` Chen-Yu Tsai
2015-03-21  9:30     ` Hans de Goede
2015-05-26 15:48   ` Felipe Balbi
2015-05-26 16:36     ` Hans de Goede
2015-05-26 17:06       ` Felipe Balbi
2015-03-20 19:11 ` [PATCH v2 07/13] ARM: dts: sun4i: Add USB Dual Role Controller Hans de Goede
2015-03-20 19:11 ` [PATCH v2 08/13] ARM: dts: sun5i: " Hans de Goede
2015-03-20 19:11 ` [PATCH v2 09/13] ARM: dts: sun7i: " Hans de Goede
2015-03-20 19:11 ` [PATCH v2 10/13] ARM: dts: sun4i: Enable USB DRC on Chuwi V7 CW0825 Hans de Goede
2015-03-20 19:11 ` [PATCH v2 11/13] ARM: dts: sun5i: Enable USB DRC on UTOO P66 Hans de Goede
2015-03-20 19:11 ` [PATCH v2 12/13] ARM: dts: sun7i: Enable USB DRC on Cubietruck Hans de Goede
2015-03-20 19:11 ` [PATCH v2 13/13] ARM: dts: sun7i: Enable USB DRC on A20-OLinuxIno-Lime Hans de Goede
2015-03-23 16:49 ` [PATCH v2 00/13] musb: Add support for the Allwinner sunxi musb controller Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426878682-14521-5-git-send-email-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).