projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] sky2: set_power_state should be void
[powerpc.git]
/
drivers
/
mmc
/
pxamci.c
diff --git
a/drivers/mmc/pxamci.c
b/drivers/mmc/pxamci.c
index
eb42cb3
..
b49368f
100644
(file)
--- a/
drivers/mmc/pxamci.c
+++ b/
drivers/mmc/pxamci.c
@@
-119,7
+119,7
@@
static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
nob = 0xffff;
writel(nob, host->base + MMC_NOB);
nob = 0xffff;
writel(nob, host->base + MMC_NOB);
- writel(
1 << data->blksz_bits
, host->base + MMC_BLKLEN);
+ writel(
data->blksz
, host->base + MMC_BLKLEN);
clks = (unsigned long long)data->timeout_ns * CLOCKRATE;
do_div(clks, 1000000000UL);
clks = (unsigned long long)data->timeout_ns * CLOCKRATE;
do_div(clks, 1000000000UL);
@@
-198,7
+198,6
@@
static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd,
static void pxamci_finish_request(struct pxamci_host *host, struct mmc_request *mrq)
{
static void pxamci_finish_request(struct pxamci_host *host, struct mmc_request *mrq)
{
- pr_debug("PXAMCI: request done\n");
host->mrq = NULL;
host->cmd = NULL;
host->data = NULL;
host->mrq = NULL;
host->cmd = NULL;
host->data = NULL;
@@
-284,14
+283,14
@@
static int pxamci_data_done(struct pxamci_host *host, unsigned int stat)
* data blocks as being in error.
*/
if (data->error == MMC_ERR_NONE)
* data blocks as being in error.
*/
if (data->error == MMC_ERR_NONE)
- data->bytes_xfered = data->blocks
<< data->blksz_bits
;
+ data->bytes_xfered = data->blocks
* data->blksz
;
else
data->bytes_xfered = 0;
pxamci_disable_irq(host, DATA_TRAN_DONE);
host->data = NULL;
else
data->bytes_xfered = 0;
pxamci_disable_irq(host, DATA_TRAN_DONE);
host->data = NULL;
- if (host->mrq->stop
&& data->error == MMC_ERR_NONE
) {
+ if (host->mrq->stop) {
pxamci_stop_clock(host);
pxamci_start_cmd(host, host->mrq->stop, 0);
} else {
pxamci_stop_clock(host);
pxamci_start_cmd(host, host->mrq->stop, 0);
} else {
@@
-309,12
+308,10
@@
static irqreturn_t pxamci_irq(int irq, void *devid, struct pt_regs *regs)
ireg = readl(host->base + MMC_I_REG);
ireg = readl(host->base + MMC_I_REG);
- pr_debug("PXAMCI: irq %08x\n", ireg);
-
if (ireg) {
unsigned stat = readl(host->base + MMC_STAT);
if (ireg) {
unsigned stat = readl(host->base + MMC_STAT);
- pr_debug("PXAMCI:
stat %08x\n"
, stat);
+ pr_debug("PXAMCI:
irq %08x stat %08x\n", ireg
, stat);
if (ireg & END_CMD_RES)
handled |= pxamci_cmd_done(host, stat);
if (ireg & END_CMD_RES)
handled |= pxamci_cmd_done(host, stat);
@@
-368,10
+365,6
@@
static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
{
struct pxamci_host *host = mmc_priv(mmc);
{
struct pxamci_host *host = mmc_priv(mmc);
- pr_debug("pxamci_set_ios: clock %u power %u vdd %u.%02u\n",
- ios->clock, ios->power_mode, ios->vdd / 100,
- ios->vdd % 100);
-
if (ios->clock) {
unsigned int clk = CLOCKRATE / ios->clock;
if (CLOCKRATE / clk > ios->clock)
if (ios->clock) {
unsigned int clk = CLOCKRATE / ios->clock;
if (CLOCKRATE / clk > ios->clock)
@@
-397,7
+390,7
@@
static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
host->cmdat |= CMDAT_INIT;
}
host->cmdat |= CMDAT_INIT;
}
- pr_debug("
pxamci_set_ios
: clkrt = %x cmdat = %x\n",
+ pr_debug("
PXAMCI
: clkrt = %x cmdat = %x\n",
host->clkrt, host->cmdat);
}
host->clkrt, host->cmdat);
}