Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (36f49ca8) · Commits · 戴 / test

Pull x86 cleanups from Thomas Gleixner: "Trival cleanups" * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/iommu: Use NULL instead of 0 x86/platform/pcspeaker: Use PTR_ERR_OR_ZERO() to fix ptr_ret.cocci warning

arch/x86/kernel/pci-iommu_table.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ void __init check_iommu_entries(struct iommu_table_entry *start,
		printk(KERN_ERR "CYCLIC DEPENDENCY FOUND! %pS depends on %pS and vice-versa. BREAKING IT.\n",
		p->detect, q->detect);
		/* Heavy handed way..*/
		x->depend = 0;
		x->depend = NULL;
		}
		}

arch/x86/kernel/pcspeaker.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,6 @@ static __init int add_pcspkr(void)

		pd = platform_device_register_simple("pcspkr", -1, NULL, 0);

		return IS_ERR(pd) ? PTR_ERR(pd) : 0;
		return PTR_ERR_OR_ZERO(pd);
		}
		device_initcall(add_pcspkr);

Admin message