From: Scott Branden <sbranden@broadcom.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Peter Griffin <peter.griffin@linaro.org>,
Stephen Warren <swarren@wwwdotorg.org>,
Chris Ball <chris@printf.net>, Piotr Krol <pietrushnic@gmail.com>
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
Joe Perches <joe@perches.com>,
linux-rpi-kernel@lists.infradead.org, Ray Jui <rjui@broadcom.com>,
bcm-kernel-feedback-list@broadcom.com,
Scott Branden <sbranden@broadcom.com>
Subject: [PATCHv2 1/5] mmc: sdhci-bcm2835: group read and write functions to improve readability
Date: Wed, 29 Oct 2014 23:36:53 -0700 [thread overview]
Message-ID: <1414651017-3545-2-git-send-email-sbranden@broadcom.com> (raw)
In-Reply-To: <1414651017-3545-1-git-send-email-sbranden@broadcom.com>
Group the read and write functions to improve readability. Now all
similar functions are grouped together to evaluate behaviours.
Signed-off-by: Scott Branden <sbranden@broadcom.com>
---
drivers/mmc/host/sdhci-bcm2835.c | 61 +++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 30 deletions(-)
diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c
index 439d259..c8ee02c 100644
--- a/drivers/mmc/host/sdhci-bcm2835.c
+++ b/drivers/mmc/host/sdhci-bcm2835.c
@@ -54,13 +54,6 @@ struct bcm2835_sdhci {
u32 shadow;
};
-static void bcm2835_sdhci_writel(struct sdhci_host *host, u32 val, int reg)
-{
- writel(val, host->ioaddr + reg);
-
- udelay(BCM2835_SDHCI_WRITE_DELAY);
-}
-
static inline u32 bcm2835_sdhci_readl(struct sdhci_host *host, int reg)
{
u32 val = readl(host->ioaddr + reg);
@@ -71,6 +64,34 @@ static inline u32 bcm2835_sdhci_readl(struct sdhci_host *host, int reg)
return val;
}
+static u16 bcm2835_sdhci_readw(struct sdhci_host *host, int reg)
+{
+ u32 val = bcm2835_sdhci_readl(host, (reg & ~3));
+ u32 word_num = (reg >> 1) & 1;
+ u32 word_shift = word_num * 16;
+ u32 word = (val >> word_shift) & 0xffff;
+
+ return word;
+}
+
+static u8 bcm2835_sdhci_readb(struct sdhci_host *host, int reg)
+{
+ u32 val = bcm2835_sdhci_readl(host, (reg & ~3));
+ u32 byte_num = reg & 3;
+ u32 byte_shift = byte_num * 8;
+ u32 byte = (val >> byte_shift) & 0xff;
+
+ return byte;
+}
+
+static void bcm2835_sdhci_writel(struct sdhci_host *host, u32 val, int reg)
+{
+ writel(val, host->ioaddr + reg);
+
+ udelay(BCM2835_SDHCI_WRITE_DELAY);
+}
+
+
static void bcm2835_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -88,16 +109,6 @@ static void bcm2835_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
bcm2835_sdhci_writel(host, newval, reg & ~3);
}
-static u16 bcm2835_sdhci_readw(struct sdhci_host *host, int reg)
-{
- u32 val = bcm2835_sdhci_readl(host, (reg & ~3));
- u32 word_num = (reg >> 1) & 1;
- u32 word_shift = word_num * 16;
- u32 word = (val >> word_shift) & 0xffff;
-
- return word;
-}
-
static void bcm2835_sdhci_writeb(struct sdhci_host *host, u8 val, int reg)
{
u32 oldval = bcm2835_sdhci_readl(host, reg & ~3);
@@ -109,28 +120,18 @@ static void bcm2835_sdhci_writeb(struct sdhci_host *host, u8 val, int reg)
bcm2835_sdhci_writel(host, newval, reg & ~3);
}
-static u8 bcm2835_sdhci_readb(struct sdhci_host *host, int reg)
-{
- u32 val = bcm2835_sdhci_readl(host, (reg & ~3));
- u32 byte_num = reg & 3;
- u32 byte_shift = byte_num * 8;
- u32 byte = (val >> byte_shift) & 0xff;
-
- return byte;
-}
-
static unsigned int bcm2835_sdhci_get_min_clock(struct sdhci_host *host)
{
return MIN_FREQ;
}
static const struct sdhci_ops bcm2835_sdhci_ops = {
- .write_l = bcm2835_sdhci_writel,
- .write_w = bcm2835_sdhci_writew,
- .write_b = bcm2835_sdhci_writeb,
.read_l = bcm2835_sdhci_readl,
.read_w = bcm2835_sdhci_readw,
.read_b = bcm2835_sdhci_readb,
+ .write_l = bcm2835_sdhci_writel,
+ .write_w = bcm2835_sdhci_writew,
+ .write_b = bcm2835_sdhci_writeb,
.set_clock = sdhci_set_clock,
.get_max_clock = sdhci_pltfm_clk_get_max_clock,
.get_min_clock = bcm2835_sdhci_get_min_clock,
--
1.7.9.5
next prev parent reply other threads:[~2014-10-30 6:37 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Scott Branden <sbranden@broadcom.com>
2014-10-15 2:01 ` [PATCH 0/1] sdhci-bcm2835: added quirk and removed udelay in write ops Scott Branden
2014-10-15 2:01 ` [PATCH 1/1] mmc: " Scott Branden
2014-10-17 2:50 ` Stephen Warren
2014-10-15 16:43 ` Scott Branden
2014-10-18 2:37 ` Stephen Warren
2014-10-18 6:40 ` Scott Branden
2014-10-30 6:36 ` [PATCHv2 0/5] " Scott Branden
2014-10-30 6:36 ` Scott Branden [this message]
2014-10-30 6:36 ` [PATCHv2 2/5] mmc: sdhci-bcm2835: make shift calculations consistent Scott Branden
2014-11-05 4:48 ` Stephen Warren
2014-11-05 5:19 ` Scott Branden
2014-10-30 6:36 ` [PATCHv2 3/5] mmc: shdci-bcm2835: add efficient back-to-back write workaround Scott Branden
2014-11-05 4:57 ` Stephen Warren
2014-11-05 6:55 ` Scott Branden
2014-11-06 4:48 ` Stephen Warren
2014-11-07 18:29 ` Scott Branden
2014-10-30 6:36 ` [PATCHv2 4/5] mmc: shdci-bcm2835: add verify for 32-bit back-to-back workaround Scott Branden
2014-11-05 4:44 ` Stephen Warren
2014-11-05 5:26 ` Scott Branden
2014-11-05 4:59 ` Stephen Warren
2014-11-05 7:00 ` Scott Branden
2014-11-06 5:01 ` Stephen Warren
2014-11-07 18:31 ` Scott Branden
2015-12-22 15:55 ` Stefan Wahren
2015-12-22 19:23 ` Scott Branden
2015-12-22 20:13 ` Stefan Wahren
2014-10-30 6:36 ` [PATCHv2 5/5] mmc: sdhci-bcm2835: add sdhci quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 Scott Branden
2014-11-05 5:00 ` Stephen Warren
2014-11-05 7:02 ` Scott Branden
2014-11-06 4:50 ` Stephen Warren
2014-11-07 18:30 ` Scott Branden
2014-12-05 0:11 ` [PATCH] mmc: sdhci: add quirk for ACMD23 broken Scott Branden
2014-12-05 0:16 ` [PATCH v2] " Scott Branden
2014-12-17 18:36 ` Scott Branden
2014-12-17 19:48 ` Chris Ball
2014-12-17 20:42 ` Scott Branden
2015-02-10 0:06 ` [PATCH 0/4] Add support for IPROC SDHCI controller Scott Branden
2015-02-10 0:06 ` [PATCH 1/4] mmc: sdhci: add quirk for ACMD23 broken Scott Branden
2015-02-10 0:06 ` [PATCH 2/4] mmc: sdhci: do not set AUTO_CMD12 for multi-block CMD53 Scott Branden
2015-02-10 0:06 ` [PATCH 3/4] mmc: sdhci-iproc: add IPROC SDHCI driver Scott Branden
2015-02-10 0:06 ` [PATCH 4/4] mmc: sdhci-iproc: add device tree bindings Scott Branden
2015-03-02 23:50 ` Florian Fainelli
2015-03-04 23:14 ` Scott Branden
[not found] ` <1423526791-29453-1-git-send-email-sbranden-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
2015-02-26 17:28 ` [PATCH 0/4] Add support for IPROC SDHCI controller Scott Branden
2015-03-05 15:59 ` [PATCH RESEND " Scott Branden
2015-03-05 15:59 ` [PATCH 1/4] mmc: sdhci: add quirk for ACMD23 broken Scott Branden
2015-03-05 15:59 ` [PATCH 2/4] mmc: sdhci: do not set AUTO_CMD12 for multi-block CMD53 Scott Branden
2015-03-05 15:59 ` [PATCH 3/4] mmc: sdhci-iproc: add IPROC SDHCI driver Scott Branden
2015-03-05 15:59 ` [PATCH 4/4] mmc: sdhci-iproc: add device tree bindings Scott Branden
2015-03-05 16:16 ` [PATCH RESEND 0/4] Add support for IPROC SDHCI controller Ulf Hansson
2015-03-05 19:57 ` Florian Fainelli
2015-03-10 18:35 ` [PATCH] mmc: sdhci: fix card presence logic in sdhci_request function Scott Branden
2015-03-13 10:14 ` Ulf Hansson
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=1414651017-3545-2-git-send-email-sbranden@broadcom.com \
--to=sbranden@broadcom.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=chris@printf.net \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=peter.griffin@linaro.org \
--cc=pietrushnic@gmail.com \
--cc=rjui@broadcom.com \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=swarren@wwwdotorg.org \
--cc=ulf.hansson@linaro.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).