From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 02/14] atmel_mci: rename atmel_mci_readl/writel to atmci_readl/writel
Date: Fri, 25 Jan 2013 16:17:35 +0100 [thread overview]
Message-ID: <1359127067-30079-2-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1359127067-30079-1-git-send-email-plagnioj@jcrosoft.com>
to be consistent with the kernel
This also reduce the ligne length
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
drivers/mci/atmel_mci.c | 43 +++++++++++++++++++++----------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c
index d6ac458..ca5cd5c 100644
--- a/drivers/mci/atmel_mci.c
+++ b/drivers/mci/atmel_mci.c
@@ -51,12 +51,12 @@ struct atmel_mci {
| AT91_MCI_OVRE \
| AT91_MCI_UNRE)
-static inline u32 atmel_mci_readl(struct atmel_mci *host, u32 offset)
+static inline u32 atmci_readl(struct atmel_mci *host, u32 offset)
{
return readl(host->base + offset);
}
-static inline void atmel_mci_writel(struct atmel_mci *host, u32 offset,
+static inline void atmci_writel(struct atmel_mci *host, u32 offset,
u32 value)
{
writel(value, host->base + offset);
@@ -64,9 +64,9 @@ static inline void atmel_mci_writel(struct atmel_mci *host, u32 offset,
static void atmel_mci_reset(struct atmel_mci *host)
{
- atmel_mci_writel(host, AT91_MCI_CR, AT91_MCI_SWRST | AT91_MCI_MCIDIS);
- atmel_mci_writel(host, AT91_MCI_DTOR, 0x7f);
- atmel_mci_writel(host, AT91_MCI_IDR, ~0UL);
+ atmci_writel(host, AT91_MCI_CR, AT91_MCI_SWRST | AT91_MCI_MCIDIS);
+ atmci_writel(host, AT91_MCI_DTOR, 0x7f);
+ atmci_writel(host, AT91_MCI_IDR, ~0UL);
}
static void atmel_set_clk_rate(struct atmel_mci *host,
@@ -87,7 +87,7 @@ static void atmel_set_clk_rate(struct atmel_mci *host,
dev_dbg(host->hw_dev, "atmel_set_clk_rate: clkIn=%d clkIos=%d divider=%d\n",
clk_in, clk_ios, divider);
- atmel_mci_writel(host, AT91_MCI_MR, (AT91_MCI_CLKDIV & divider)
+ atmci_writel(host, AT91_MCI_MR, (AT91_MCI_CLKDIV & divider)
| AT91_MCI_RDPROOF | AT91_MCI_WRPROOF);
}
@@ -97,7 +97,7 @@ static int atmel_poll_status(struct atmel_mci *host, u32 mask)
uint64_t start = get_time_ns();
do {
- stat = atmel_mci_readl(host, AT91_MCI_SR);
+ stat = atmci_readl(host, AT91_MCI_SR);
if (stat & STATUS_ERROR_MASK)
return stat;
if (is_timeout(start, SECOND)) {
@@ -119,7 +119,7 @@ static int atmel_pull(struct atmel_mci *host, void *_buf, int bytes)
if (stat)
return stat;
- *buf++ = atmel_mci_readl(host, AT91_MCI_RDR);
+ *buf++ = atmci_readl(host, AT91_MCI_RDR);
bytes -= 4;
}
@@ -140,7 +140,7 @@ static int atmel_push(struct atmel_mci *host, const void *_buf, int bytes)
if (stat)
return stat;
- atmel_mci_writel(host, AT91_MCI_TDR, *buf++);
+ atmci_writel(host, AT91_MCI_TDR, *buf++);
bytes -= 4;
}
@@ -228,7 +228,7 @@ static void atmel_setup_data(struct atmel_mci *host, struct mci_data *data)
dev_dbg(host->hw_dev, "atmel_setup_data: nob=%d blksz=%d\n",
nob, blksz);
- atmel_mci_writel(host, AT91_MCI_BLKR, AT91_MCI_BLKR_BCNT(nob)
+ atmci_writel(host, AT91_MCI_BLKR, AT91_MCI_BLKR_BCNT(nob)
| AT91_MCI_BLKR_BLKLEN(blksz));
host->datasize = datasize;
@@ -254,9 +254,9 @@ static int atmel_read_response(struct atmel_mci *host, unsigned int stat)
if (cmd->resp_type & MMC_RSP_PRESENT) {
if (cmd->resp_type & MMC_RSP_136) {
for (i = 0; i < 4; i++)
- resp[i] = atmel_mci_readl(host, AT91_MCI_RSPR(0));
+ resp[i] = atmci_readl(host, AT91_MCI_RSPR(0));
} else {
- resp[0] = atmel_mci_readl(host, AT91_MCI_RSPR(0));
+ resp[0] = atmci_readl(host, AT91_MCI_RSPR(0));
}
}
@@ -295,7 +295,7 @@ static int atmel_start_cmd(struct atmel_mci *host, struct mci_cmd *cmd,
if (host->cmd != NULL)
dev_err(host->hw_dev, "error!\n");
- if ((atmel_mci_readl(host, AT91_MCI_SR) & AT91_MCI_CMDRDY) == 0) {
+ if ((atmci_readl(host, AT91_MCI_SR) & AT91_MCI_CMDRDY) == 0) {
dev_err(host->hw_dev, "mci not ready!\n");
return -EBUSY;
}
@@ -325,8 +325,8 @@ static int atmel_start_cmd(struct atmel_mci *host, struct mci_cmd *cmd,
cmdval |= AT91_MCI_RSPTYP & flags;
cmdval |= cmdat & ~(AT91_MCI_CMDNB | AT91_MCI_RSPTYP);
- atmel_mci_writel(host, AT91_MCI_ARGR, cmd->cmdarg);
- atmel_mci_writel(host, AT91_MCI_CMDR, cmdval);
+ atmci_writel(host, AT91_MCI_ARGR, cmd->cmdarg);
+ atmci_writel(host, AT91_MCI_CMDR, cmdval);
return 0;
}
@@ -360,26 +360,25 @@ static void mci_set_ios(struct mci_host *mci, struct mci_ios *ios)
switch (ios->bus_width) {
case MMC_BUS_WIDTH_4:
- atmel_mci_writel(host, AT91_MCI_SDCR, AT91_MCI_SDCBUS_4BIT);
+ atmci_writel(host, AT91_MCI_SDCR, AT91_MCI_SDCBUS_4BIT);
break;
case MMC_BUS_WIDTH_8:
- atmel_mci_writel(host, AT91_MCI_SDCR, AT91_MCI_SDCBUS_8BIT);
+ atmci_writel(host, AT91_MCI_SDCR, AT91_MCI_SDCBUS_8BIT);
break;
case MMC_BUS_WIDTH_1:
- atmel_mci_writel(host, AT91_MCI_SDCR, AT91_MCI_SDCBUS_1BIT);
+ atmci_writel(host, AT91_MCI_SDCR, AT91_MCI_SDCBUS_1BIT);
break;
default:
return;
}
- atmel_mci_writel(host, AT91_MCI_SDCR, atmel_mci_readl(host, AT91_MCI_SDCR)
+ atmci_writel(host, AT91_MCI_SDCR, atmci_readl(host, AT91_MCI_SDCR)
| host->slot_b);
if (ios->clock) {
atmel_set_clk_rate(host, ios->clock);
- atmel_mci_writel(host, AT91_MCI_CR, AT91_MCI_MCIEN
- );
+ atmci_writel(host, AT91_MCI_CR, AT91_MCI_MCIEN);
} else {
- atmel_mci_writel(host, AT91_MCI_CR, AT91_MCI_MCIDIS);
+ atmci_writel(host, AT91_MCI_CR, AT91_MCI_MCIDIS);
}
return;
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-01-25 15:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 15:14 [for master PATCH 00/14] atmel_mci: fixes and cleanup Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 01/14] atmel_mci: rename atmel_mci_host tp atmel_mci Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2013-01-25 15:17 ` [PATCH 03/14] atmel_mci: rename all function to start with atmci Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 04/14] atmel_mci: use linux regs define Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 05/14] atmel_mci: detect IP version Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 06/14] atmel_mci: version 0x5xx of the IP have a different clk div Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 07/14] atmel_mci: fix host init Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 08/14] atmel_mci: rwproof is only needed since IP version 0x200 Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 17:31 ` Sascha Hauer
2013-01-25 17:35 ` Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 09/14] atmel_mci: on version 0x0 we need to reset the IP at each request Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 10/14] atmel_mci: after a software timeout the IP need to be reset Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 11/14] atmel_mci: support the SD highspeed since IP version 0x300 Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 12/14] atmel_mci: update the SD/SDIO Card Register at request time Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 13/14] atmel_mci: drop board host caps Jean-Christophe PLAGNIOL-VILLARD
2013-01-25 15:17 ` [PATCH 14/14] atmel_mci: gpio: request and configure card detect Jean-Christophe PLAGNIOL-VILLARD
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=1359127067-30079-2-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@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