From b5b8eda9c6f13cbffbbfe69bd41ce38e348cb6b0 Mon Sep 17 00:00:00 2001 From: Stephane Chazelas Date: Fri, 18 Apr 2008 13:44:15 -0700 Subject: [PATCH] --- yaml --- r: 93007 b: refs/heads/master c: 0bc88c59cc2f031a38ad5902d5764497549217c5 h: refs/heads/master i: 93005: b33d3f0f10e36cdf5edb9a57b0ab2b2fa098cc02 93003: 6f9697d92c070599fd3e6153716e7ef514131cc4 92999: 75598b53f46b13764b06e62d48796eae47f74b3e 92991: 24cbfcf127b0f221af1836f8d73596322241f25c v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/block2mtd.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6fc4c0cbf7f7..8af0bf89fb72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25dc30b4cd68df1de8932fe77ca574227d42a259 +refs/heads/master: 0bc88c59cc2f031a38ad5902d5764497549217c5 diff --git a/trunk/drivers/mtd/devices/block2mtd.c b/trunk/drivers/mtd/devices/block2mtd.c index ad1880c67518..519d942e7940 100644 --- a/trunk/drivers/mtd/devices/block2mtd.c +++ b/trunk/drivers/mtd/devices/block2mtd.c @@ -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; @@ -366,9 +366,9 @@ static inline void kill_final_newline(char *str) } -#define parse_err(fmt, args...) do { \ - ERROR("block2mtd: " fmt "\n", ## args); \ - return 0; \ +#define parse_err(fmt, args...) do { \ + ERROR(fmt, ## args); \ + return 0; \ } while (0) #ifndef MODULE @@ -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); }