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

Commit 0bc88c59 authored by Stephane Chazelas's avatar Stephane Chazelas Committed by David Woodhouse
Browse files

[MTD] block2mtd: logging typo fixes 



Address a number of small issues mainly regarding the output made by this
driver to dmesg:

- Some of the blkmtd's had not been changed to block2mtd which caused
  display problem

- the parse_err() macro was displaying "block2mtd: " twice

Signed-off-by: default avatarStéphane Chazelas <stephane.chazelas@emerson.com>
Acked-by: default avatarJörn Engel <joern@lazybastard.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 25dc30b4

drivers/mtd/devices/block2mtd.c

+5 −5
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) 
	}

	list_add(&dev->list, &blkmtd_device_list);

	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,

			dev->mtd.name + strlen("blkmtd: "),

			dev->mtd.name + strlen("block2mtd: "),

			dev->mtd.erasesize >> 10, dev->mtd.erasesize);

	return dev;
@@ -367,7 +367,7 @@ static inline void kill_final_newline(char *str) 




#define parse_err(fmt, args...) do {	\

	ERROR("block2mtd: " fmt "\n", ## args);	\

	ERROR(fmt, ## args);		\

	return 0;			\

} while (0)
@@ -473,7 +473,7 @@ static void __devexit block2mtd_exit(void) 
		block2mtd_sync(&dev->mtd);

		del_mtd_device(&dev->mtd);

		INFO("mtd%d: [%s] removed", dev->mtd.index,

				dev->mtd.name + strlen("blkmtd: "));

				dev->mtd.name + strlen("block2mtd: "));

		list_del(&dev->list);

		block2mtd_free_device(dev);

	}