Skip to content

Commit

Permalink
[SCSI] mmc_block: use generic helper to print capacities
Browse files Browse the repository at this point in the history
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
Pierre Ossman authored and James Bottomley committed Oct 3, 2008
1 parent a30c3f6 commit a7bbb57
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/mmc/card/block.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <linux/blkdev.h>
#include <linux/mutex.h>
#include <linux/scatterlist.h>
#include <linux/string_helpers.h>

#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
Expand Down Expand Up @@ -532,6 +533,8 @@ static int mmc_blk_probe(struct mmc_card *card)
struct mmc_blk_data *md;
int err;

char cap_str[10];

/*
* Check that the card supports the command class(es) we need.
*/
Expand All @@ -546,10 +549,11 @@ static int mmc_blk_probe(struct mmc_card *card)
if (err)
goto out;

printk(KERN_INFO "%s: %s %s %lluKiB %s\n",
string_get_size(get_capacity(md->disk) << 9, STRING_UNITS_2,
cap_str, sizeof(cap_str));
printk(KERN_INFO "%s: %s %s %s %s\n",
md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
(unsigned long long)(get_capacity(md->disk) >> 1),
md->read_only ? "(ro)" : "");
cap_str, md->read_only ? "(ro)" : "");

mmc_set_drvdata(card, md);
add_disk(md->disk);
Expand Down

0 comments on commit a7bbb57

Please sign in to comment.