sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

mci: Be more verbose on what device is associated to which disk 

This is quite useful when multiple SD cards are present so spare
some bytes to print this information.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2012-02-09 11:50:07 +01:00
parent 5f6d792a78
commit 80116a24da
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mci/mci-core.c
View File

@ -1241,7 +1241,7 @@ static struct block_device_ops mci_ops = {
static int mci_card_probe(struct mci *mci)
{
struct mci_host *host = mci->host;
int rc;
int rc, disknum;
/* start with a host interface reset */
rc = (host->init)(host, mci->mci_dev);
@ -1288,9 +1288,9 @@ static int mci_card_probe(struct mci *mci)
mci->blk.dev = mci->mci_dev;
mci->blk.ops = &mci_ops;
rc = cdev_find_free_index("disk");
disknum = cdev_find_free_index("disk");
mci->blk.cdev.name = asprintf("disk%d", rc);
mci->blk.cdev.name = asprintf("disk%d", disknum);
mci->blk.blockbits = SECTOR_SHIFT;
mci->blk.num_blocks = mci_calc_blk_cnt(mci->capacity, mci->blk.blockbits);
@ -1300,6 +1300,8 @@ static int mci_card_probe(struct mci *mci)
goto on_error;
}
dev_info(mci->mci_dev, "registered disk%d\n", disknum);
/* create partitions on demand */
rc = parse_partition_table(&mci->blk);
if (rc != 0) {
@ -1382,6 +1384,8 @@ static int mci_probe(struct device_d *mci_dev)
mci->mci_dev = mci_dev;
mci->host = mci_dev->platform_data;
dev_info(mci->host->hw_dev, "registered as %s\n", dev_name(mci_dev));
#ifdef CONFIG_MCI_STARTUP
/* if enabled, probe the attached card immediately */
rc = mci_card_probe(mci);