sys/dev/disk/dm: Remove aprint_normal()
authorTomohiro Kusumi <kusumi.tomohiro@gmail.com>
Tue, 20 Oct 2015 14:18:53 +0000 (23:18 +0900)
committerTomohiro Kusumi <kusumi.tomohiro@gmail.com>
Tue, 20 Oct 2015 14:52:17 +0000 (23:52 +0900)
This is a macro for kprintf, but dm and targets basically
never use this except for a few. There isn't really any
point to keep macro version of kprintf, so get rid of it.

sys/dev/disk/dm/device-mapper.c
sys/dev/disk/dm/dm.h
sys/dev/disk/dm/dm_pdev.c

index 5ad4f01..8a74d5b 100644 (file)
@@ -449,16 +449,16 @@ dmstrategy(struct dev_strategy_args *ap)
                end = MIN(table_end, buf_start + buf_len);
 
                if (dm_debug_level) {
-                       aprint_normal("----------------------------------------\n");
-                       aprint_normal("table_start %010" PRIu64", table_end %010"
+                       kprintf("----------------------------------------\n");
+                       kprintf("table_start %010" PRIu64", table_end %010"
                            PRIu64 "\n", table_start, table_end);
-                       aprint_normal("buf_start %010" PRIu64", buf_len %010"
+                       kprintf("buf_start %010" PRIu64", buf_len %010"
                            PRIu64"\n", buf_start, buf_len);
-                       aprint_normal("start-buf_start %010"PRIu64", end %010"
+                       kprintf("start-buf_start %010"PRIu64", end %010"
                            PRIu64"\n", start - buf_start, end);
-                       aprint_normal("start %010" PRIu64", end %010"
+                       kprintf("start %010" PRIu64", end %010"
                            PRIu64"\n", start, end);
-                       aprint_normal("----------------------------------------\n");
+                       kprintf("----------------------------------------\n");
                }
 
                if (bypass) {
index a0b19f4..e26bbd4 100644 (file)
@@ -284,7 +284,6 @@ MALLOC_DECLARE(M_DM);
 
 #define aprint_debug(format, ...)      \
     do { if (dm_debug_level) kprintf(format, ## __VA_ARGS__); } while(0)
-#define aprint_normal  kprintf
 
 #define DM_TARGET_MODULE(name, evh)                            \
     static moduledata_t name##_mod = {                         \
index 26b0cc9..8432dbc 100644 (file)
@@ -168,7 +168,7 @@ dm_pdev_insert(const char *dev_name)
                        dpart->media_blocks,
                        dpart->media_blksize);
        } else {
-               aprint_normal("dmp_pdev_insert DIOCGPART failed %d\n", error);
+               kprintf("dmp_pdev_insert DIOCGPART failed %d\n", error);
        }
 
        SLIST_INSERT_HEAD(&dm_pdev_list, dmp, next_pdev);