summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Kacur <jkacur@redhat.com>2009-10-08 17:20:15 +0200
committerH. Peter Anvin <hpa@zytor.com>2009-10-08 16:14:02 -0700
commit5a943617ef52e9f79cd7cf437aad8870be27aabb (patch)
tree967a0145cb287468c8c36c5f3d227cabb30a3e6e
parent170a0bc3808909d8ea0f3f9c725c6565efe7f9c4 (diff)
downloadblackbird-op-linux-5a943617ef52e9f79cd7cf437aad8870be27aabb.tar.gz
blackbird-op-linux-5a943617ef52e9f79cd7cf437aad8870be27aabb.zip
x86, cpuid: Simplify the code in cpuid_open
Peter picked up my patch for tip/x86/cpu that removes the bkl in cpuid_open. Ingo subsequently merged that into tip/master. This patch folds back in tglx's 55968ede164ae523692f00717f50cd926f1382a0 to my patch that removed the bkl. This simplifies the code, and makes it consistent with the changes to kill the bkl in msr.c as well. Originally-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Kacur <jkacur@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/kernel/cpuid.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index ef6928418c8f..48e8e6558b26 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -116,18 +116,16 @@ static int cpuid_open(struct inode *inode, struct file *file)
{
unsigned int cpu;
struct cpuinfo_x86 *c;
- int ret = 0;
cpu = iminor(file->f_path.dentry->d_inode);
- if (cpu >= nr_cpu_ids || !cpu_online(cpu)) {
- ret = -ENXIO; /* No such CPU */
- goto out;
- }
+ if (cpu >= nr_cpu_ids || !cpu_online(cpu))
+ return -ENXIO; /* No such CPU */
+
c = &cpu_data(cpu);
if (c->cpuid_level < 0)
- ret = -EIO; /* CPUID not supported */
-out:
- return ret;
+ return -EIO; /* CPUID not supported */
+
+ return 0;
}
/*
OpenPOWER on IntegriCloud