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

Commit 3bfd49c8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

device create: x86: convert device_create to device_create_drvdata 



device_create() is race-prone, so use the race-free
device_create_drvdata() instead as device_create() is going away.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bc00bc92

arch/x86/kernel/cpuid.c

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ static __cpuinit int cpuid_device_create(int cpu) 
{

	struct device *dev;



	dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu),

			    "cpu%d", cpu);

	dev = device_create_drvdata(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu),

				    NULL, "cpu%d", cpu);

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

arch/x86/kernel/msr.c

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ static int __cpuinit msr_device_create(int cpu) 
{

	struct device *dev;



	dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, cpu),

			    "msr%d", cpu);

	dev = device_create_drvdata(msr_class, NULL, MKDEV(MSR_MAJOR, cpu),

				    NULL, "msr%d", cpu);

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}