forked from Minki/linux
[MMC] Lindent wbsd driver
Fix the coding style in the wbsd driver once and for all. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Pierre Ossman
Russell King
parent
cb757b4eef
commit
cfa7f52164
@ -217,8 +217,7 @@ static void wbsd_request_end(struct wbsd_host* host, struct mmc_request* mrq)
|
||||
|
||||
DBGF("Ending request, cmd (%x)\n", mrq->cmd->opcode);
|
||||
|
||||
if (host->dma >= 0)
|
||||
{
|
||||
if (host->dma >= 0) {
|
||||
/*
|
||||
* Release ISA DMA controller.
|
||||
*/
|
||||
@ -270,8 +269,7 @@ static inline int wbsd_next_sg(struct wbsd_host* host)
|
||||
/*
|
||||
* Any entries left?
|
||||
*/
|
||||
if (host->num_sg > 0)
|
||||
{
|
||||
if (host->num_sg > 0) {
|
||||
host->offset = 0;
|
||||
host->remain = host->cur_sg->length;
|
||||
}
|
||||
@ -308,8 +306,7 @@ static inline void wbsd_sg_to_dma(struct wbsd_host* host, struct mmc_data* data)
|
||||
* be the entire list though so make sure that
|
||||
* we do not transfer too much.
|
||||
*/
|
||||
for (i = 0;i < len;i++)
|
||||
{
|
||||
for (i = 0; i < len; i++) {
|
||||
sgbuf = kmap_atomic(sg[i].page, KM_BIO_SRC_IRQ) + sg[i].offset;
|
||||
if (size < sg[i].length)
|
||||
memcpy(dmabuf, sgbuf, size);
|
||||
@ -354,8 +351,7 @@ static inline void wbsd_dma_to_sg(struct wbsd_host* host, struct mmc_data* data)
|
||||
* be the entire list though so make sure that
|
||||
* we do not transfer too much.
|
||||
*/
|
||||
for (i = 0;i < len;i++)
|
||||
{
|
||||
for (i = 0; i < len; i++) {
|
||||
sgbuf = kmap_atomic(sg[i].page, KM_BIO_SRC_IRQ) + sg[i].offset;
|
||||
if (size < sg[i].length)
|
||||
memcpy(sgbuf, dmabuf, size);
|
||||
@ -393,22 +389,16 @@ static inline void wbsd_get_short_reply(struct wbsd_host* host,
|
||||
/*
|
||||
* Correct response type?
|
||||
*/
|
||||
if (wbsd_read_index(host, WBSD_IDX_RSPLEN) != WBSD_RSP_SHORT)
|
||||
{
|
||||
if (wbsd_read_index(host, WBSD_IDX_RSPLEN) != WBSD_RSP_SHORT) {
|
||||
cmd->error = MMC_ERR_INVALID;
|
||||
return;
|
||||
}
|
||||
|
||||
cmd->resp[0] =
|
||||
wbsd_read_index(host, WBSD_IDX_RESP12) << 24;
|
||||
cmd->resp[0] |=
|
||||
wbsd_read_index(host, WBSD_IDX_RESP13) << 16;
|
||||
cmd->resp[0] |=
|
||||
wbsd_read_index(host, WBSD_IDX_RESP14) << 8;
|
||||
cmd->resp[0] |=
|
||||
wbsd_read_index(host, WBSD_IDX_RESP15) << 0;
|
||||
cmd->resp[1] =
|
||||
wbsd_read_index(host, WBSD_IDX_RESP16) << 24;
|
||||
cmd->resp[0] = wbsd_read_index(host, WBSD_IDX_RESP12) << 24;
|
||||
cmd->resp[0] |= wbsd_read_index(host, WBSD_IDX_RESP13) << 16;
|
||||
cmd->resp[0] |= wbsd_read_index(host, WBSD_IDX_RESP14) << 8;
|
||||
cmd->resp[0] |= wbsd_read_index(host, WBSD_IDX_RESP15) << 0;
|
||||
cmd->resp[1] = wbsd_read_index(host, WBSD_IDX_RESP16) << 24;
|
||||
}
|
||||
|
||||
static inline void wbsd_get_long_reply(struct wbsd_host *host,
|
||||
@ -419,14 +409,12 @@ static inline void wbsd_get_long_reply(struct wbsd_host* host,
|
||||
/*
|
||||
* Correct response type?
|
||||
*/
|
||||
if (wbsd_read_index(host, WBSD_IDX_RSPLEN) != WBSD_RSP_LONG)
|
||||
{
|
||||
if (wbsd_read_index(host, WBSD_IDX_RSPLEN) != WBSD_RSP_LONG) {
|
||||
cmd->error = MMC_ERR_INVALID;
|
||||
return;
|
||||
}
|
||||
|
||||
for (i = 0;i < 4;i++)
|
||||
{
|
||||
for (i = 0; i < 4; i++) {
|
||||
cmd->resp[i] =
|
||||
wbsd_read_index(host, WBSD_IDX_RESP1 + i * 4) << 24;
|
||||
cmd->resp[i] |=
|
||||
@ -471,8 +459,7 @@ static void wbsd_send_command(struct wbsd_host* host, struct mmc_command* cmd)
|
||||
/*
|
||||
* Do we expect a reply?
|
||||
*/
|
||||
if ((cmd->flags & MMC_RSP_MASK) != MMC_RSP_NONE)
|
||||
{
|
||||
if ((cmd->flags & MMC_RSP_MASK) != MMC_RSP_NONE) {
|
||||
/*
|
||||
* Read back status.
|
||||
*/
|
||||
@ -488,8 +475,7 @@ static void wbsd_send_command(struct wbsd_host* host, struct mmc_command* cmd)
|
||||
else if ((cmd->flags & MMC_RSP_CRC) && (isr & WBSD_INT_CRC))
|
||||
cmd->error = MMC_ERR_BADCRC;
|
||||
/* All ok */
|
||||
else
|
||||
{
|
||||
else {
|
||||
if ((cmd->flags & MMC_RSP_MASK) == MMC_RSP_SHORT)
|
||||
wbsd_get_short_reply(host, cmd);
|
||||
else
|
||||
@ -522,8 +508,7 @@ static void wbsd_empty_fifo(struct wbsd_host* host)
|
||||
* Drain the fifo. This has a tendency to loop longer
|
||||
* than the FIFO length (usually one block).
|
||||
*/
|
||||
while (!((fsr = inb(host->base + WBSD_FSR)) & WBSD_FIFO_EMPTY))
|
||||
{
|
||||
while (!((fsr = inb(host->base + WBSD_FSR)) & WBSD_FIFO_EMPTY)) {
|
||||
/*
|
||||
* The size field in the FSR is broken so we have to
|
||||
* do some guessing.
|
||||
@ -535,8 +520,7 @@ static void wbsd_empty_fifo(struct wbsd_host* host)
|
||||
else
|
||||
fifo = 1;
|
||||
|
||||
for (i = 0;i < fifo;i++)
|
||||
{
|
||||
for (i = 0; i < fifo; i++) {
|
||||
*buffer = inb(host->base + WBSD_DFR);
|
||||
buffer++;
|
||||
host->offset++;
|
||||
@ -547,8 +531,7 @@ static void wbsd_empty_fifo(struct wbsd_host* host)
|
||||
/*
|
||||
* Transfer done?
|
||||
*/
|
||||
if (data->bytes_xfered == host->size)
|
||||
{
|
||||
if (data->bytes_xfered == host->size) {
|
||||
wbsd_kunmap_sg(host);
|
||||
return;
|
||||
}
|
||||
@ -556,15 +539,13 @@ static void wbsd_empty_fifo(struct wbsd_host* host)
|
||||
/*
|
||||
* End of scatter list entry?
|
||||
*/
|
||||
if (host->remain == 0)
|
||||
{
|
||||
if (host->remain == 0) {
|
||||
wbsd_kunmap_sg(host);
|
||||
|
||||
/*
|
||||
* Get next entry. Check if last.
|
||||
*/
|
||||
if (!wbsd_next_sg(host))
|
||||
{
|
||||
if (!wbsd_next_sg(host)) {
|
||||
/*
|
||||
* We should never reach this point.
|
||||
* It means that we're trying to
|
||||
@ -613,8 +594,7 @@ static void wbsd_fill_fifo(struct wbsd_host* host)
|
||||
* Fill the fifo. This has a tendency to loop longer
|
||||
* than the FIFO length (usually one block).
|
||||
*/
|
||||
while (!((fsr = inb(host->base + WBSD_FSR)) & WBSD_FIFO_FULL))
|
||||
{
|
||||
while (!((fsr = inb(host->base + WBSD_FSR)) & WBSD_FIFO_FULL)) {
|
||||
/*
|
||||
* The size field in the FSR is broken so we have to
|
||||
* do some guessing.
|
||||
@ -626,8 +606,7 @@ static void wbsd_fill_fifo(struct wbsd_host* host)
|
||||
else
|
||||
fifo = 15;
|
||||
|
||||
for (i = 16;i > fifo;i--)
|
||||
{
|
||||
for (i = 16; i > fifo; i--) {
|
||||
outb(*buffer, host->base + WBSD_DFR);
|
||||
buffer++;
|
||||
host->offset++;
|
||||
@ -638,8 +617,7 @@ static void wbsd_fill_fifo(struct wbsd_host* host)
|
||||
/*
|
||||
* Transfer done?
|
||||
*/
|
||||
if (data->bytes_xfered == host->size)
|
||||
{
|
||||
if (data->bytes_xfered == host->size) {
|
||||
wbsd_kunmap_sg(host);
|
||||
return;
|
||||
}
|
||||
@ -647,15 +625,13 @@ static void wbsd_fill_fifo(struct wbsd_host* host)
|
||||
/*
|
||||
* End of scatter list entry?
|
||||
*/
|
||||
if (host->remain == 0)
|
||||
{
|
||||
if (host->remain == 0) {
|
||||
wbsd_kunmap_sg(host);
|
||||
|
||||
/*
|
||||
* Get next entry. Check if last.
|
||||
*/
|
||||
if (!wbsd_next_sg(host))
|
||||
{
|
||||
if (!wbsd_next_sg(host)) {
|
||||
/*
|
||||
* We should never reach this point.
|
||||
* It means that we're trying to
|
||||
@ -706,8 +682,10 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
|
||||
*/
|
||||
if (data->timeout_ns > 127000000)
|
||||
wbsd_write_index(host, WBSD_IDX_TAAC, 127);
|
||||
else
|
||||
wbsd_write_index(host, WBSD_IDX_TAAC, data->timeout_ns/1000000);
|
||||
else {
|
||||
wbsd_write_index(host, WBSD_IDX_TAAC,
|
||||
data->timeout_ns / 1000000);
|
||||
}
|
||||
|
||||
if (data->timeout_clks > 255)
|
||||
wbsd_write_index(host, WBSD_IDX_NSAC, 255);
|
||||
@ -722,23 +700,18 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
|
||||
* Space for CRC must be included in the size.
|
||||
* Two bytes are needed for each data line.
|
||||
*/
|
||||
if (host->bus_width == MMC_BUS_WIDTH_1)
|
||||
{
|
||||
if (host->bus_width == MMC_BUS_WIDTH_1) {
|
||||
blksize = (1 << data->blksz_bits) + 2;
|
||||
|
||||
wbsd_write_index(host, WBSD_IDX_PBSMSB, (blksize >> 4) & 0xF0);
|
||||
wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
|
||||
}
|
||||
else if (host->bus_width == MMC_BUS_WIDTH_4)
|
||||
{
|
||||
} else if (host->bus_width == MMC_BUS_WIDTH_4) {
|
||||
blksize = (1 << data->blksz_bits) + 2 * 4;
|
||||
|
||||
wbsd_write_index(host, WBSD_IDX_PBSMSB, ((blksize >> 4) & 0xF0)
|
||||
| WBSD_DATA_WIDTH);
|
||||
wbsd_write_index(host, WBSD_IDX_PBSMSB,
|
||||
((blksize >> 4) & 0xF0) | WBSD_DATA_WIDTH);
|
||||
wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
data->error = MMC_ERR_INVALID;
|
||||
return;
|
||||
}
|
||||
@ -755,14 +728,12 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
|
||||
/*
|
||||
* DMA transfer?
|
||||
*/
|
||||
if (host->dma >= 0)
|
||||
{
|
||||
if (host->dma >= 0) {
|
||||
/*
|
||||
* The buffer for DMA is only 64 kB.
|
||||
*/
|
||||
BUG_ON(host->size > 0x10000);
|
||||
if (host->size > 0x10000)
|
||||
{
|
||||
if (host->size > 0x10000) {
|
||||
data->error = MMC_ERR_INVALID;
|
||||
return;
|
||||
}
|
||||
@ -794,9 +765,7 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
|
||||
* Enable DMA on the host.
|
||||
*/
|
||||
wbsd_write_index(host, WBSD_IDX_DMA, WBSD_DMA_ENABLE);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
/*
|
||||
* This flag is used to keep printk
|
||||
* output to a minimum.
|
||||
@ -817,13 +786,10 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
|
||||
* Set up FIFO threshold levels (and fill
|
||||
* buffer if doing a write).
|
||||
*/
|
||||
if (data->flags & MMC_DATA_READ)
|
||||
{
|
||||
if (data->flags & MMC_DATA_READ) {
|
||||
wbsd_write_index(host, WBSD_IDX_FIFOEN,
|
||||
WBSD_FIFOEN_FULL | 8);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
wbsd_write_index(host, WBSD_IDX_FIFOEN,
|
||||
WBSD_FIFOEN_EMPTY | 8);
|
||||
wbsd_fill_fifo(host);
|
||||
@ -851,16 +817,14 @@ static void wbsd_finish_data(struct wbsd_host* host, struct mmc_data* data)
|
||||
* Wait for the controller to leave data
|
||||
* transfer state.
|
||||
*/
|
||||
do
|
||||
{
|
||||
do {
|
||||
status = wbsd_read_index(host, WBSD_IDX_STATUS);
|
||||
} while (status & (WBSD_BLOCK_READ | WBSD_BLOCK_WRITE));
|
||||
|
||||
/*
|
||||
* DMA transfer?
|
||||
*/
|
||||
if (host->dma >= 0)
|
||||
{
|
||||
if (host->dma >= 0) {
|
||||
/*
|
||||
* Disable DMA on the host.
|
||||
*/
|
||||
@ -878,16 +842,13 @@ static void wbsd_finish_data(struct wbsd_host* host, struct mmc_data* data)
|
||||
/*
|
||||
* Any leftover data?
|
||||
*/
|
||||
if (count)
|
||||
{
|
||||
if (count) {
|
||||
printk(KERN_ERR "%s: Incomplete DMA transfer. "
|
||||
"%d bytes left.\n",
|
||||
mmc_hostname(host->mmc), count);
|
||||
|
||||
data->error = MMC_ERR_FAILED;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
/*
|
||||
* Transfer data from DMA buffer to
|
||||
* SG list.
|
||||
@ -930,8 +891,7 @@ static void wbsd_request(struct mmc_host* mmc, struct mmc_request* mrq)
|
||||
* If there is no card in the slot then
|
||||
* timeout immediatly.
|
||||
*/
|
||||
if (!(host->flags & WBSD_FCARD_PRESENT))
|
||||
{
|
||||
if (!(host->flags & WBSD_FCARD_PRESENT)) {
|
||||
cmd->error = MMC_ERR_TIMEOUT;
|
||||
goto done;
|
||||
}
|
||||
@ -939,8 +899,7 @@ static void wbsd_request(struct mmc_host* mmc, struct mmc_request* mrq)
|
||||
/*
|
||||
* Does the request include data?
|
||||
*/
|
||||
if (cmd->data)
|
||||
{
|
||||
if (cmd->data) {
|
||||
wbsd_prepare_data(host, cmd->data);
|
||||
|
||||
if (cmd->data->error != MMC_ERR_NONE)
|
||||
@ -954,8 +913,7 @@ static void wbsd_request(struct mmc_host* mmc, struct mmc_request* mrq)
|
||||
* will be finished after the data has
|
||||
* transfered.
|
||||
*/
|
||||
if (cmd->data && (cmd->error == MMC_ERR_NONE))
|
||||
{
|
||||
if (cmd->data && (cmd->error == MMC_ERR_NONE)) {
|
||||
/*
|
||||
* Dirty fix for hardware bug.
|
||||
*/
|
||||
@ -1004,8 +962,7 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
|
||||
* Only write to the clock register when
|
||||
* there is an actual change.
|
||||
*/
|
||||
if (clk != host->clk)
|
||||
{
|
||||
if (clk != host->clk) {
|
||||
wbsd_write_index(host, WBSD_IDX_CLK, clk);
|
||||
host->clk = clk;
|
||||
}
|
||||
@ -1013,8 +970,7 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
|
||||
/*
|
||||
* Power up card.
|
||||
*/
|
||||
if (ios->power_mode != MMC_POWER_OFF)
|
||||
{
|
||||
if (ios->power_mode != MMC_POWER_OFF) {
|
||||
pwr = inb(host->base + WBSD_CSR);
|
||||
pwr &= ~WBSD_POWER_N;
|
||||
outb(pwr, host->base + WBSD_CSR);
|
||||
@ -1026,16 +982,12 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
|
||||
* that needs to be disabled.
|
||||
*/
|
||||
setup = wbsd_read_index(host, WBSD_IDX_SETUP);
|
||||
if (ios->chip_select == MMC_CS_HIGH)
|
||||
{
|
||||
if (ios->chip_select == MMC_CS_HIGH) {
|
||||
BUG_ON(ios->bus_width != MMC_BUS_WIDTH_1);
|
||||
setup |= WBSD_DAT3_H;
|
||||
host->flags |= WBSD_FIGNORE_DETECT;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (setup & WBSD_DAT3_H)
|
||||
{
|
||||
} else {
|
||||
if (setup & WBSD_DAT3_H) {
|
||||
setup &= ~WBSD_DAT3_H;
|
||||
|
||||
/*
|
||||
@ -1144,8 +1096,7 @@ static void wbsd_tasklet_card(unsigned long param)
|
||||
|
||||
spin_lock(&host->lock);
|
||||
|
||||
if (host->flags & WBSD_FIGNORE_DETECT)
|
||||
{
|
||||
if (host->flags & WBSD_FIGNORE_DETECT) {
|
||||
spin_unlock(&host->lock);
|
||||
return;
|
||||
}
|
||||
@ -1153,23 +1104,18 @@ static void wbsd_tasklet_card(unsigned long param)
|
||||
csr = inb(host->base + WBSD_CSR);
|
||||
WARN_ON(csr == 0xff);
|
||||
|
||||
if (csr & WBSD_CARDPRESENT)
|
||||
{
|
||||
if (!(host->flags & WBSD_FCARD_PRESENT))
|
||||
{
|
||||
if (csr & WBSD_CARDPRESENT) {
|
||||
if (!(host->flags & WBSD_FCARD_PRESENT)) {
|
||||
DBG("Card inserted\n");
|
||||
host->flags |= WBSD_FCARD_PRESENT;
|
||||
|
||||
delay = 500;
|
||||
}
|
||||
}
|
||||
else if (host->flags & WBSD_FCARD_PRESENT)
|
||||
{
|
||||
} else if (host->flags & WBSD_FCARD_PRESENT) {
|
||||
DBG("Card removed\n");
|
||||
host->flags &= ~WBSD_FCARD_PRESENT;
|
||||
|
||||
if (host->mrq)
|
||||
{
|
||||
if (host->mrq) {
|
||||
printk(KERN_ERR "%s: Card removed during transfer!\n",
|
||||
mmc_hostname(host->mmc));
|
||||
wbsd_reset(host);
|
||||
@ -1213,8 +1159,7 @@ static void wbsd_tasklet_fifo(unsigned long param)
|
||||
/*
|
||||
* Done?
|
||||
*/
|
||||
if (host->size == data->bytes_xfered)
|
||||
{
|
||||
if (host->size == data->bytes_xfered) {
|
||||
wbsd_write_index(host, WBSD_IDX_FIFOEN, 0);
|
||||
tasklet_schedule(&host->finish_tasklet);
|
||||
}
|
||||
@ -1300,8 +1245,7 @@ static void wbsd_tasklet_block(unsigned long param)
|
||||
spin_lock(&host->lock);
|
||||
|
||||
if ((wbsd_read_index(host, WBSD_IDX_CRCSTATUS) & WBSD_CRC_MASK) !=
|
||||
WBSD_CRC_OK)
|
||||
{
|
||||
WBSD_CRC_OK) {
|
||||
data = wbsd_get_data(host);
|
||||
if (!data)
|
||||
goto end;
|
||||
@ -1477,16 +1421,14 @@ static int __devinit wbsd_scan(struct wbsd_host* host)
|
||||
wbsd_lock_config(host);
|
||||
|
||||
for (k = 0; k < ARRAY_SIZE(valid_ids); k++) {
|
||||
if (id == valid_ids[k])
|
||||
{
|
||||
if (id == valid_ids[k]) {
|
||||
host->chip_id = id;
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (id != 0xFFFF)
|
||||
{
|
||||
if (id != 0xFFFF) {
|
||||
DBG("Unknown hardware (id %x) found at %x\n",
|
||||
id, config_ports[i]);
|
||||
}
|
||||
@ -1579,8 +1521,8 @@ kfree:
|
||||
*/
|
||||
BUG_ON(1);
|
||||
|
||||
dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE,
|
||||
DMA_BIDIRECTIONAL);
|
||||
dma_unmap_single(host->mmc->dev, host->dma_addr,
|
||||
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
|
||||
host->dma_addr = (dma_addr_t)NULL;
|
||||
|
||||
kfree(host->dma_buffer);
|
||||
@ -1596,9 +1538,10 @@ err:
|
||||
|
||||
static void __devexit wbsd_release_dma(struct wbsd_host *host)
|
||||
{
|
||||
if (host->dma_addr)
|
||||
dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE,
|
||||
DMA_BIDIRECTIONAL);
|
||||
if (host->dma_addr) {
|
||||
dma_unmap_single(host->mmc->dev, host->dma_addr,
|
||||
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
|
||||
}
|
||||
kfree(host->dma_buffer);
|
||||
if (host->dma >= 0)
|
||||
free_dma(host->dma);
|
||||
@ -1629,12 +1572,18 @@ static int __devinit wbsd_request_irq(struct wbsd_host* host, int irq)
|
||||
/*
|
||||
* Set up tasklets.
|
||||
*/
|
||||
tasklet_init(&host->card_tasklet, wbsd_tasklet_card, (unsigned long)host);
|
||||
tasklet_init(&host->fifo_tasklet, wbsd_tasklet_fifo, (unsigned long)host);
|
||||
tasklet_init(&host->crc_tasklet, wbsd_tasklet_crc, (unsigned long)host);
|
||||
tasklet_init(&host->timeout_tasklet, wbsd_tasklet_timeout, (unsigned long)host);
|
||||
tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish, (unsigned long)host);
|
||||
tasklet_init(&host->block_tasklet, wbsd_tasklet_block, (unsigned long)host);
|
||||
tasklet_init(&host->card_tasklet, wbsd_tasklet_card,
|
||||
(unsigned long)host);
|
||||
tasklet_init(&host->fifo_tasklet, wbsd_tasklet_fifo,
|
||||
(unsigned long)host);
|
||||
tasklet_init(&host->crc_tasklet, wbsd_tasklet_crc,
|
||||
(unsigned long)host);
|
||||
tasklet_init(&host->timeout_tasklet, wbsd_tasklet_timeout,
|
||||
(unsigned long)host);
|
||||
tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish,
|
||||
(unsigned long)host);
|
||||
tasklet_init(&host->block_tasklet, wbsd_tasklet_block,
|
||||
(unsigned long)host);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1820,16 +1769,12 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
|
||||
* Scan for hardware.
|
||||
*/
|
||||
ret = wbsd_scan(host);
|
||||
if (ret)
|
||||
{
|
||||
if (pnp && (ret == -ENODEV))
|
||||
{
|
||||
if (ret) {
|
||||
if (pnp && (ret == -ENODEV)) {
|
||||
printk(KERN_WARNING DRIVER_NAME
|
||||
": Unable to confirm device presence. You may "
|
||||
"experience lock-ups.\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
wbsd_free_mmc(dev);
|
||||
return ret;
|
||||
}
|
||||
@ -1839,8 +1784,7 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
|
||||
* Request resources.
|
||||
*/
|
||||
ret = wbsd_request_resources(host, io, irq, dma);
|
||||
if (ret)
|
||||
{
|
||||
if (ret) {
|
||||
wbsd_release_resources(host);
|
||||
wbsd_free_mmc(dev);
|
||||
return ret;
|
||||
@ -1849,18 +1793,15 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
|
||||
/*
|
||||
* See if chip needs to be configured.
|
||||
*/
|
||||
if (pnp)
|
||||
{
|
||||
if ((host->config != 0) && !wbsd_chip_validate(host))
|
||||
{
|
||||
if (pnp) {
|
||||
if ((host->config != 0) && !wbsd_chip_validate(host)) {
|
||||
printk(KERN_WARNING DRIVER_NAME
|
||||
": PnP active but chip not configured! "
|
||||
"You probably have a buggy BIOS. "
|
||||
"Configuring chip manually.\n");
|
||||
wbsd_chip_config(host);
|
||||
}
|
||||
}
|
||||
else
|
||||
} else
|
||||
wbsd_chip_config(host);
|
||||
|
||||
/*
|
||||
@ -1868,8 +1809,7 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
|
||||
* Not tested.
|
||||
*/
|
||||
#ifdef CONFIG_PM
|
||||
if (host->config)
|
||||
{
|
||||
if (host->config) {
|
||||
wbsd_unlock_config(host);
|
||||
wbsd_write_config(host, WBSD_CONF_PME, 0xA0);
|
||||
wbsd_lock_config(host);
|
||||
@ -1996,7 +1936,8 @@ static int wbsd_resume(struct wbsd_host *host)
|
||||
return mmc_resume_host(host->mmc);
|
||||
}
|
||||
|
||||
static int wbsd_platform_suspend(struct platform_device *dev, pm_message_t state)
|
||||
static int wbsd_platform_suspend(struct platform_device *dev,
|
||||
pm_message_t state)
|
||||
{
|
||||
struct mmc_host *mmc = platform_get_drvdata(dev);
|
||||
struct wbsd_host *host;
|
||||
@ -2072,10 +2013,8 @@ static int wbsd_pnp_resume(struct pnp_dev *pnp_dev)
|
||||
/*
|
||||
* See if chip needs to be configured.
|
||||
*/
|
||||
if (host->config != 0)
|
||||
{
|
||||
if (!wbsd_chip_validate(host))
|
||||
{
|
||||
if (host->config != 0) {
|
||||
if (!wbsd_chip_validate(host)) {
|
||||
printk(KERN_WARNING DRIVER_NAME
|
||||
": PnP active but chip not configured! "
|
||||
"You probably have a buggy BIOS. "
|
||||
@ -2146,31 +2085,26 @@ static int __init wbsd_drv_init(void)
|
||||
|
||||
#ifdef CONFIG_PNP
|
||||
|
||||
if (!nopnp)
|
||||
{
|
||||
if (!nopnp) {
|
||||
result = pnp_register_driver(&wbsd_pnp_driver);
|
||||
if (result < 0)
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_PNP */
|
||||
|
||||
if (nopnp)
|
||||
{
|
||||
if (nopnp) {
|
||||
result = platform_driver_register(&wbsd_driver);
|
||||
if (result < 0)
|
||||
return result;
|
||||
|
||||
wbsd_device = platform_device_alloc(DRIVER_NAME, -1);
|
||||
if (!wbsd_device)
|
||||
{
|
||||
if (!wbsd_device) {
|
||||
platform_driver_unregister(&wbsd_driver);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
result = platform_device_add(wbsd_device);
|
||||
if (result)
|
||||
{
|
||||
if (result) {
|
||||
platform_device_put(wbsd_device);
|
||||
platform_driver_unregister(&wbsd_driver);
|
||||
return result;
|
||||
@ -2189,8 +2123,7 @@ static void __exit wbsd_drv_exit(void)
|
||||
|
||||
#endif /* CONFIG_PNP */
|
||||
|
||||
if (nopnp)
|
||||
{
|
||||
if (nopnp) {
|
||||
platform_device_unregister(wbsd_device);
|
||||
|
||||
platform_driver_unregister(&wbsd_driver);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user