Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 278981c5 authored by Brian Norris's avatar Brian Norris Committed by Artem Bityutskiy
Browse files

mtd: cleanup last uses of MTD_DEBUG config macros 



Some messages that were tied to CONFIG_MTD_DEBUG_VERBOSE can now simply
be enabled using dynamic debugging features, if necessary. There's no
need for special debugging functions here.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@intel.com>
parent 87ed114b

drivers/mtd/inftlmount.c

+43 −58
Original line number Diff line number Diff line
@@ -139,9 +139,7 @@ static int find_boot_record(struct INFTLrecord *inftl) 
		mh->FormatFlags = le32_to_cpu(mh->FormatFlags);

		mh->PercentUsed = le32_to_cpu(mh->PercentUsed);



#ifdef CONFIG_MTD_DEBUG_VERBOSE

		if (CONFIG_MTD_DEBUG_VERBOSE >= 2) {

			printk("INFTL: Media Header ->\n"

		pr_debug("INFTL: Media Header ->\n"

			 "    bootRecordID          = %s\n"

			 "    NoOfBootImageBlocks   = %d\n"

			 "    NoOfBinaryPartitions  = %d\n"
@@ -155,8 +153,6 @@ static int find_boot_record(struct INFTLrecord *inftl) 
			 mh->NoOfBDTLPartitions,

			 mh->BlockMultiplierBits, mh->FormatFlags,

			 mh->OsakVersion, mh->PercentUsed);

		}

#endif



		if (mh->NoOfBDTLPartitions == 0) {

			printk(KERN_WARNING "INFTL: Media Header sanity check "
@@ -200,9 +196,7 @@ static int find_boot_record(struct INFTLrecord *inftl) 
			ip->spareUnits = le32_to_cpu(ip->spareUnits);

			ip->Reserved0 = le32_to_cpu(ip->Reserved0);



#ifdef CONFIG_MTD_DEBUG_VERBOSE

			if (CONFIG_MTD_DEBUG_VERBOSE >= 2) {

				printk("    PARTITION[%d] ->\n"

			pr_debug("    PARTITION[%d] ->\n"

				 "        virtualUnits    = %d\n"

				 "        firstUnit       = %d\n"

				 "        lastUnit        = %d\n"
@@ -211,8 +205,6 @@ static int find_boot_record(struct INFTLrecord *inftl) 
				 i, ip->virtualUnits, ip->firstUnit,

				 ip->lastUnit, ip->flags,

				 ip->spareUnits);

			}

#endif



			if (ip->Reserved0 != ip->firstUnit) {

				struct erase_info *instr = &inftl->instr;
@@ -475,30 +467,30 @@ void INFTL_dumptables(struct INFTLrecord *s) 
{

	int i;



	printk("-------------------------------------------"

	pr_debug("-------------------------------------------"

		"----------------------------------\n");



	printk("VUtable[%d] ->", s->nb_blocks);

	pr_debug("VUtable[%d] ->", s->nb_blocks);

	for (i = 0; i < s->nb_blocks; i++) {

		if ((i % 8) == 0)

			printk("\n%04x: ", i);

		printk("%04x ", s->VUtable[i]);

			pr_debug("\n%04x: ", i);

		pr_debug("%04x ", s->VUtable[i]);

	}



	printk("\n-------------------------------------------"

	pr_debug("\n-------------------------------------------"

		"----------------------------------\n");



	printk("PUtable[%d-%d=%d] ->", s->firstEUN, s->lastEUN, s->nb_blocks);

	pr_debug("PUtable[%d-%d=%d] ->", s->firstEUN, s->lastEUN, s->nb_blocks);

	for (i = 0; i <= s->lastEUN; i++) {

		if ((i % 8) == 0)

			printk("\n%04x: ", i);

		printk("%04x ", s->PUtable[i]);

			pr_debug("\n%04x: ", i);

		pr_debug("%04x ", s->PUtable[i]);

	}



	printk("\n-------------------------------------------"

	pr_debug("\n-------------------------------------------"

		"----------------------------------\n");



	printk("INFTL ->\n"

	pr_debug("INFTL ->\n"

		"  EraseSize       = %d\n"

		"  h/s/c           = %d/%d/%d\n"

		"  numvunits       = %d\n"
@@ -512,7 +504,7 @@ void INFTL_dumptables(struct INFTLrecord *s) 
		s->numvunits, s->firstEUN, s->lastEUN, s->numfreeEUNs,

		s->LastFreeEUN, s->nb_blocks, s->nb_boot_blocks);



	printk("\n-------------------------------------------"

	pr_debug("\n-------------------------------------------"

		"----------------------------------\n");

}
@@ -520,25 +512,25 @@ void INFTL_dumpVUchains(struct INFTLrecord *s) 
{

	int logical, block, i;



	printk("-------------------------------------------"

	pr_debug("-------------------------------------------"

		"----------------------------------\n");



	printk("INFTL Virtual Unit Chains:\n");

	pr_debug("INFTL Virtual Unit Chains:\n");

	for (logical = 0; logical < s->nb_blocks; logical++) {

		block = s->VUtable[logical];

		if (block > s->nb_blocks)

			continue;

		printk("  LOGICAL %d --> %d ", logical, block);

		pr_debug("  LOGICAL %d --> %d ", logical, block);

		for (i = 0; i < s->nb_blocks; i++) {

			if (s->PUtable[block] == BLOCK_NIL)

				break;

			block = s->PUtable[block];

			printk("%d ", block);

			pr_debug("%d ", block);

		}

		printk("\n");

		pr_debug("\n");

	}



	printk("-------------------------------------------"

	pr_debug("-------------------------------------------"

		"----------------------------------\n");

}
@@ -716,10 +708,7 @@ int INFTL_mount(struct INFTLrecord *s) 
		logical_block = BLOCK_NIL;

	}



#ifdef CONFIG_MTD_DEBUG_VERBOSE

	if (CONFIG_MTD_DEBUG_VERBOSE >= 2)

	INFTL_dumptables(s);

#endif



	/*

	 * Second pass, check for infinite loops in chains. These are
@@ -771,12 +760,8 @@ int INFTL_mount(struct INFTLrecord *s) 
		}

	}



#ifdef CONFIG_MTD_DEBUG_VERBOSE

	if (CONFIG_MTD_DEBUG_VERBOSE >= 2)

	INFTL_dumptables(s);

	if (CONFIG_MTD_DEBUG_VERBOSE >= 2)

	INFTL_dumpVUchains(s);

#endif



	/*

	 * Third pass, format unreferenced blocks and init free block count.

drivers/mtd/maps/pcmciamtd.c

+0 −4
Original line number Diff line number Diff line
@@ -321,7 +321,6 @@ static void pcmciamtd_release(struct pcmcia_device *link) 
}





#ifdef CONFIG_MTD_DEBUG

static int pcmciamtd_cistpl_format(struct pcmcia_device *p_dev,

				tuple_t *tuple,

				void *priv_data)
@@ -352,7 +351,6 @@ static int pcmciamtd_cistpl_jedec(struct pcmcia_device *p_dev, 
	}

	return -ENOSPC;

}

#endif



static int pcmciamtd_cistpl_device(struct pcmcia_device *p_dev,

				tuple_t *tuple,
@@ -419,10 +417,8 @@ static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *p_dev 
		pr_debug("Found name: %s\n", dev->mtd_name);

	}



#ifdef CONFIG_MTD_DEBUG

	pcmcia_loop_tuple(p_dev, CISTPL_FORMAT, pcmciamtd_cistpl_format, NULL);

	pcmcia_loop_tuple(p_dev, CISTPL_JEDEC_C, pcmciamtd_cistpl_jedec, NULL);

#endif

	pcmcia_loop_tuple(p_dev, CISTPL_DEVICE, pcmciamtd_cistpl_device, dev);

	pcmcia_loop_tuple(p_dev, CISTPL_DEVICE_GEO, pcmciamtd_cistpl_geo, dev);