Commit ce999ed1 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: block: Simplify logging during probe about added partitions 



To simplify the code, move the logging into the common mmc_blk_alloc_req()
and drop the rather useless information about the partition type/id.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20210303122049.151986-3-ulf.hansson@linaro.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1d848c28

drivers/mmc/core/block.c

+9 −16
Original line number Diff line number Diff line
@@ -2261,6 +2261,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, 
{

	struct mmc_blk_data *md;

	int devidx, ret;

	char cap_str[10];



	devidx = ida_simple_get(&mmc_blk_ida, 0, max_devices, GFP_KERNEL);

	if (devidx < 0) {
@@ -2365,6 +2366,12 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, 
		blk_queue_write_cache(md->queue.queue, true, true);

	}



	string_get_size((u64)size, 512, STRING_UNITS_2,

			cap_str, sizeof(cap_str));

	pr_info("%s: %s %s %s %s\n",

		md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),

		cap_str, md->read_only ? "(ro)" : "");



	return md;



 err_putdisk:
@@ -2407,7 +2414,6 @@ static int mmc_blk_alloc_part(struct mmc_card *card, 
			      const char *subname,

			      int area_type)

{

	char cap_str[10];

	struct mmc_blk_data *part_md;



	part_md = mmc_blk_alloc_req(card, disk_to_dev(md->disk), size, default_ro,
@@ -2417,11 +2423,6 @@ static int mmc_blk_alloc_part(struct mmc_card *card, 
	part_md->part_type = part_type;

	list_add(&part_md->part, &md->part);



	string_get_size((u64)get_capacity(part_md->disk), 512, STRING_UNITS_2,

			cap_str, sizeof(cap_str));

	pr_info("%s: %s %s partition %u %s\n",

	       part_md->disk->disk_name, mmc_card_id(card),

	       mmc_card_name(card), part_md->part_type, cap_str);

	return 0;

}
@@ -2558,9 +2559,8 @@ static int mmc_blk_alloc_rpmb_part(struct mmc_card *card, 
	string_get_size((u64)size, 512, STRING_UNITS_2,

			cap_str, sizeof(cap_str));



	pr_info("%s: %s %s partition %u %s, chardev (%d:%d)\n",

		rpmb_name, mmc_card_id(card),

		mmc_card_name(card), EXT_CSD_PART_CONFIG_ACC_RPMB, cap_str,

	pr_info("%s: %s %s %s, chardev (%d:%d)\n",

		rpmb_name, mmc_card_id(card), mmc_card_name(card), cap_str,

		MAJOR(mmc_rpmb_devt), rpmb->id);



	return 0;
@@ -2876,7 +2876,6 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, 
static int mmc_blk_probe(struct mmc_card *card)

{

	struct mmc_blk_data *md, *part_md;

	char cap_str[10];



	/*

	 * Check that the card supports the command class(es) we need.
@@ -2897,12 +2896,6 @@ static int mmc_blk_probe(struct mmc_card *card) 
	if (IS_ERR(md))

		return PTR_ERR(md);



	string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2,

			cap_str, sizeof(cap_str));

	pr_info("%s: %s %s %s %s\n",

		md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),

		cap_str, md->read_only ? "(ro)" : "");



	if (mmc_blk_alloc_parts(card, md))

		goto out;