Skip to content

Commit

Permalink
mmc: deprecate mmc bus topology
Browse files Browse the repository at this point in the history
The classic MMC bus was defined as multi card bus
system, which is reflected in the design in the MMC
layer.

When SD showed up, the bus topology was abandoned
and a star topology (one card per host) was mandated.
MMC version 4 has followed this, officially deprecating
the bus topology.

As we do not have any known users of the bus
topology we can remove support for it. This will
simplify the code and rectify some incorrect
assumptions in the newer additions.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
  • Loading branch information
Pierre Ossman committed May 1, 2007
1 parent b5af25b commit b855885
Show file tree
Hide file tree
Showing 5 changed files with 400 additions and 555 deletions.
13 changes: 5 additions & 8 deletions drivers/mmc/card/block.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
struct mmc_blk_request brq;
int ret = 1, sg_pos, data_size;

if (mmc_card_claim_host(card))
goto flush_queue;
mmc_claim_host(card->host);

do {
struct mmc_command cmd;
Expand Down Expand Up @@ -357,7 +356,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
spin_unlock_irq(&md->lock);
} while (ret);

mmc_card_release_host(card);
mmc_release_host(card->host);

return 1;

Expand Down Expand Up @@ -393,9 +392,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
spin_unlock_irq(&md->lock);
}

flush_queue:

mmc_card_release_host(card);
mmc_release_host(card->host);

spin_lock_irq(&md->lock);
while (ret) {
Expand Down Expand Up @@ -526,12 +523,12 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)
if (mmc_card_blockaddr(card))
return 0;

mmc_card_claim_host(card);
mmc_claim_host(card->host);
cmd.opcode = MMC_SET_BLOCKLEN;
cmd.arg = 1 << md->block_bits;
cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
err = mmc_wait_for_cmd(card->host, &cmd, 5);
mmc_card_release_host(card);
mmc_release_host(card->host);

if (err) {
printk(KERN_ERR "%s: unable to set block size to %d: %d\n",
Expand Down
Loading

0 comments on commit b855885

Please sign in to comment.