Commit 9bc44610 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-v5.1-rc1' of git://git.monstr.eu/linux-2.6-microblaze

Pull Microblaze update from Michal Simek:
 "Simplify debugfs initialization"

* tag 'microblaze-v5.1-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: no need to check return value of debugfs_create functions
parents f3ca4c55 226a893b
Loading
Loading
Loading
Loading
+2 −11
Original line number Original line Diff line number Diff line
@@ -192,23 +192,14 @@ struct dentry *of_debugfs_root;
static int microblaze_debugfs_init(void)
static int microblaze_debugfs_init(void)
{
{
	of_debugfs_root = debugfs_create_dir("microblaze", NULL);
	of_debugfs_root = debugfs_create_dir("microblaze", NULL);

	return 0;
	return of_debugfs_root == NULL;
}
}
arch_initcall(microblaze_debugfs_init);
arch_initcall(microblaze_debugfs_init);


# ifdef CONFIG_MMU
# ifdef CONFIG_MMU
static int __init debugfs_tlb(void)
static int __init debugfs_tlb(void)
{
{
	struct dentry *d;
	debugfs_create_u32("tlb_skip", S_IRUGO, of_debugfs_root, &tlb_skip);

	if (!of_debugfs_root)
		return -ENODEV;

	d = debugfs_create_u32("tlb_skip", S_IRUGO, of_debugfs_root, &tlb_skip);
	if (!d)
		return -ENOMEM;

	return 0;
	return 0;
}
}
device_initcall(debugfs_tlb);
device_initcall(debugfs_tlb);