initramfs: remove the populate_initrd_image and clean_rootfs stubs

If initrd support is not enable just print the warning directly instead
of hiding the fact that we just failed behind two stub functions.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/init/initramfs.c b/init/initramfs.c
index 7a38012e1af742124298ca2b299886076631f3df..d10404625c31f0b688c783f1a94c9a19fc8cfa84 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -618,13 +618,7 @@ static void __init clean_rootfs(void)
        ksys_close(fd);
        kfree(buf);
 }
-#else
-static inline void clean_rootfs(void)
-{
-}
-#endif /* CONFIG_BLK_DEV_RAM */
 
-#ifdef CONFIG_BLK_DEV_RAM
 static void __init populate_initrd_image(char *err)
 {
        ssize_t written;
@@ -644,11 +638,6 @@ static void __init populate_initrd_image(char *err)
                       written, initrd_end - initrd_start);
        ksys_close(fd);
 }
-#else
-static void __init populate_initrd_image(char *err)
-{
-       printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
-}
 #endif /* CONFIG_BLK_DEV_RAM */
 
 static int __init populate_rootfs(void)
@@ -668,8 +657,12 @@ static int __init populate_rootfs(void)
 
        err = unpack_to_rootfs((char *)initrd_start, initrd_end - initrd_start);
        if (err) {
+#ifdef CONFIG_BLK_DEV_RAM
                clean_rootfs();
                populate_initrd_image(err);
+#else
+               printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
+#endif
        }
 
 done: