From 0cd3312434cd1f29bee6bff53bf2790d733ad2a2 Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Thu, 12 Jul 2007 17:27:01 +0100 Subject: [PATCH] dm: remove duplicate module name from error msgs Remove explicit module name from messages as the macro now includes it automatically. Signed-off-by: Alasdair G Kergon Signed-off-by: Linus Torvalds --- drivers/md/dm-mpath.c | 8 +++----- drivers/md/dm-raid1.c | 5 ++--- drivers/md/dm-round-robin.c | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index c0950a0b531..fc6c1021178 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -1352,15 +1352,14 @@ static int __init dm_multipath_init(void) r = dm_register_target(&multipath_target); if (r < 0) { - DMERR("%s: register failed %d", multipath_target.name, r); + DMERR("register failed %d", r); kmem_cache_destroy(_mpio_cache); return -EINVAL; } kmultipathd = create_workqueue("kmpathd"); if (!kmultipathd) { - DMERR("%s: failed to create workqueue kmpathd", - multipath_target.name); + DMERR("failed to create workqueue kmpathd"); dm_unregister_target(&multipath_target); kmem_cache_destroy(_mpio_cache); return -ENOMEM; @@ -1381,8 +1380,7 @@ static void __exit dm_multipath_exit(void) r = dm_unregister_target(&multipath_target); if (r < 0) - DMERR("%s: target unregister failed %d", - multipath_target.name, r); + DMERR("target unregister failed %d", r); kmem_cache_destroy(_mpio_cache); } diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index ef124b71ccc..2a02180f5d0 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c @@ -1335,8 +1335,7 @@ static int __init dm_mirror_init(void) r = dm_register_target(&mirror_target); if (r < 0) { - DMERR("%s: Failed to register mirror target", - mirror_target.name); + DMERR("Failed to register mirror target"); dm_dirty_log_exit(); } @@ -1349,7 +1348,7 @@ static void __exit dm_mirror_exit(void) r = dm_unregister_target(&mirror_target); if (r < 0) - DMERR("%s: unregister failed %d", mirror_target.name, r); + DMERR("unregister failed %d", r); dm_dirty_log_exit(); } diff --git a/drivers/md/dm-round-robin.c b/drivers/md/dm-round-robin.c index a348a97b65a..391dfa2ad43 100644 --- a/drivers/md/dm-round-robin.c +++ b/drivers/md/dm-round-robin.c @@ -205,7 +205,7 @@ static void __exit dm_rr_exit(void) int r = dm_unregister_path_selector(&rr_ps); if (r < 0) - DMERR("round-robin: unregister failed %d", r); + DMERR("unregister failed %d", r); } module_init(dm_rr_init); -- 2.41.1