diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 23:03:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 12:24:43 -0400 |
commit | a9b12619f7b6f19c871437ec24a088787a04b1de (patch) | |
tree | ff1b11e7affedccfd69fc20e14876d0821f6e555 /arch/x86 | |
parent | 91bd418fdc8526ee70a0e8f7970b584c8870ae10 (diff) |
device create: misc: convert device_create_drvdata to device_create
Now that device_create() has been audited, rename things back to the
original call to be sane.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/cpuid.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/msr.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 6a44d6465991..72cefd1e649b 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c | |||
@@ -147,8 +147,8 @@ static __cpuinit int cpuid_device_create(int cpu) | |||
147 | { | 147 | { |
148 | struct device *dev; | 148 | struct device *dev; |
149 | 149 | ||
150 | dev = device_create_drvdata(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu), | 150 | dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu), NULL, |
151 | NULL, "cpu%d", cpu); | 151 | "cpu%d", cpu); |
152 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; | 152 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; |
153 | } | 153 | } |
154 | 154 | ||
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index 2e2af5d18191..82a7c7ed6d45 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c | |||
@@ -163,8 +163,8 @@ static int __cpuinit msr_device_create(int cpu) | |||
163 | { | 163 | { |
164 | struct device *dev; | 164 | struct device *dev; |
165 | 165 | ||
166 | dev = device_create_drvdata(msr_class, NULL, MKDEV(MSR_MAJOR, cpu), | 166 | dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, cpu), NULL, |
167 | NULL, "msr%d", cpu); | 167 | "msr%d", cpu); |
168 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; | 168 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; |
169 | } | 169 | } |
170 | 170 | ||