Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f057f3b2 authored by Yaowei Bai's avatar Yaowei Bai Committed by Linus Torvalds
Browse files

init/do_mounts: initrd_load() can be boolean 



Make initrd_load() return bool due to this particular function only using
either one or zero as its return value.

No functional change.

Signed-off-by: default avatarYaowei Bai <baiyaowei@cmss.chinamobile.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 31c025b5

init/do_mounts.h

+2 −2
Original line number Diff line number Diff line
@@ -57,11 +57,11 @@ static inline int rd_load_image(char *from) { return 0; } 


#ifdef CONFIG_BLK_DEV_INITRD



int __init initrd_load(void);

bool __init initrd_load(void);



#else



static inline int initrd_load(void) { return 0; }

static inline bool initrd_load(void) { return false; }



#endif

init/do_mounts_initrd.c

+3 −3
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void __init handle_initrd(void) 
	}

}



int __init initrd_load(void)

bool __init initrd_load(void)

{

	if (mount_initrd) {

		create_dev("/dev/ram", Root_RAM0);
@@ -129,9 +129,9 @@ int __init initrd_load(void) 
		if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {

			sys_unlink("/initrd.image");

			handle_initrd();

			return 1;

			return true;

		}

	}

	sys_unlink("/initrd.image");

	return 0;

	return false;

}