runtime: Only resume uses name_to_dev() function

Signed-off-by: Alexey Gladkov <[email protected]>

Author: legionus

runtime/src/devname.c

@@ -6,10 +6,8 @@ resume_SRCS = \
 	$(runtime_srcdir)/resume/resume.c \
 	$(runtime_srcdir)/resume/resumelib.c \
 	$(runtime_srcdir)/resume/getarg.c \
-	$(runtime_srcdir)/devname.c \
-	$(runtime_srcdir)/name_to_dev.c \
-	$(runtime_srcdir)/do_mounts.h \
-	$(runtime_srcdir)/kinit.h \
+	$(runtime_srcdir)/resume/name_to_dev.c \
+	$(runtime_srcdir)/resume/name_to_dev.h \
 	$(NULL)
 
 resume_CFLAGS = -I$(runtime_srcdir)

runtime/src/do_mounts.h

@@ -8,8 +8,7 @@
 #include <alloca.h>
 #include <inttypes.h>
 
-#include "do_mounts.h"
-#include "kinit.h"
+#include "name_to_dev.h"
 
 #define BUF_SZ		65536
 
@@ -63,8 +62,6 @@ static dev_t try_name(char *name, unsigned long int part)
 
 	/* if partition is within range - we got it */
 	if (part < range) {
-		dprintf("kinit: try_name %s,%d = %s\n", name, part,
-		        bdevname(res + part));
 		return res + part;
 	}
 
@@ -182,8 +179,6 @@ static inline dev_t name_to_dev_t_real(const char *name)
 dev_t name_to_dev_t(const char *name)
 {
 	dev_t dev = name_to_dev_t_real(name);
-
-	dprintf("kinit: name_to_dev_t(%s) = %s\n", name, bdevname(dev));
 	return dev;
 }
 

runtime/src/kinit.h

@@ -0,0 +1,18 @@
+#ifndef __NAME_TO_DEV_H__
+#define __NAME_TO_DEV_H__
+
+#include <sys/sysmacros.h>
+
+#define __makedev(__ma, __mi) \
+	((((__ma) & 0xfff) << 8)|((__mi) & 0xff)|(((__mi) & 0xfff00) << 12))
+
+#define	Root_RAM0	__makedev(1, 0)
+
+/* These device numbers are only used internally */
+#define Root_NFS	__makedev(0, 255)
+#define Root_MTD	__makedev(0, 254)
+#define Root_MULTI	__makedev(0, 253)
+
+dev_t name_to_dev_t(const char *name);
+
+#endif /* __NAME_TO_DEV_H__ */

runtime/src/resume/Makefile.mk

@@ -11,10 +11,15 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 
-#include "kinit.h"
-#include "do_mounts.h"
+#include "name_to_dev.h"
 #include "resume.h"
 
+#ifdef DEBUG
+# define dbg_printf printf
+#else
+# define dbg_printf(...) ((void)0)
+#endif
+
 #ifndef CONFIG_PM_STD_PARTITION
 # define CONFIG_PM_STD_PARTITION ""
 #endif
@@ -68,7 +73,7 @@ int resume(const char *resume_file, unsigned long long resume_offset)
 	if (len >= (ssize_t) sizeof(device_string))
 		goto fail_r;
 
-	dprintf("kinit: trying to resume from %s\n", resume_file);
+	dbg_printf("kinit: trying to resume from %s\n", resume_file);
 
 	if (write(powerfd, device_string, (size_t) len) != len)
 		goto fail_r;
@@ -77,7 +82,7 @@ int resume(const char *resume_file, unsigned long long resume_offset)
 failure:
 	if (powerfd >= 0)
 		close(powerfd);
-	dprintf("kinit: No resume image, doing normal boot...\n");
+	dbg_printf("kinit: No resume image, doing normal boot...\n");
 	return -1;
 
 fail_r: