Run cpuid.c and msr.c through Lindent
PATCH 1/1 Run cpuid.c and msr.c through Lindent
Run cpuid.c and msr.c through Lindent to improve readability. The only non-whitespace change was to add a missing semicolon after module_exit().
--
Brian Gerst
arch/i386/kernel/cpuid.c +82 -82
@@ -10,7 +10,6 @@* * ----------------------------------------------------------------------- */ -/* * cpuid.c *
@@ -46,131 +45,132 @@#ifdef CONFIG_SMP struct cpuid_command { -int cpu; -u32 reg; -u32 *data; +int cpu; +u32 reg; +u32 *data; };static void cpuid_smp_cpuid (void *cmd_block) { -struct cpuid_command *cmd = (struct cpuid_command *) cmd_block; - -if ( cmd->cpu ==smp_processor_id () ) -cpuid (cmd->reg, &cmd->data[0 ], &cmd->data[1 ], &cmd->data[2 ], &cmd->data[3 ]); +struct cpuid_command *cmd = (struct cpuid_command *)cmd_block; + +if (cmd->cpu ==smp_processor_id ()) +cpuid (cmd->reg, &cmd->data[0 ], &cmd->data[1 ], &cmd->data[2 ], + &cmd->data[3 ]); }static inline void do_cpuid (int cpu,u32 reg,u32 *data) { -struct cpuid_command cmd; - -preempt_disable (); -if ( cpu ==smp_processor_id () ) { -cpuid (reg, &data[0 ], &data[1 ], &data[2 ], &data[3 ]); - }else { - cmd.cpu = cpu; - cmd.reg = reg; - cmd.data = data; - -smp_call_function (cpuid_smp_cpuid, &cmd,1 ,1 ); - } -preempt_enable (); +struct cpuid_command cmd; + +preempt_disable (); +if (cpu ==smp_processor_id ()) { +cpuid (reg, &data[0 ], &data[1 ], &data[2 ], &data[3 ]); + }else { + cmd.cpu = cpu; + cmd.reg = reg; + cmd.data = data; + +smp_call_function (cpuid_smp_cpuid, &cmd,1 ,1 ); + } +preempt_enable (); }#else /* ! CONFIG_SMP */ static inline void do_cpuid (int cpu,u32 reg,u32 *data) { -cpuid (reg, &data[0 ], &data[1 ], &data[2 ], &data[3 ]); +cpuid (reg, &data[0 ], &data[1 ], &data[2 ], &data[3 ]); }#endif /* ! CONFIG_SMP */ static loff_t cpuid_seek (struct file *file,loff_t offset,int orig) { -loff_t ret; +loff_t ret; -lock_kernel (); +lock_kernel (); -switch (orig) { -case 0 : - file->f_pos = offset; - ret = file->f_pos; -break ; -case 1 : - file->f_pos += offset; - ret = file->f_pos; -break ; -default : - ret = -EINVAL ; - } - -unlock_kernel (); -return ret; -} - -static ssize_t cpuid_read (struct file * file,char * buf, -size_t count,loff_t *ppos) -{ -u32 *tmp = (u32 *)buf; -u32 data[4 ]; -size_t rv; -u32 reg = *ppos; -int cpu =iminor (file->f_dentry->d_inode); - -if ( count %16 ) -return -EINVAL ;/* Invalid chunk size */ - -for ( rv =0 ; count ; count -=16 ) { -do_cpuid (cpu, reg, data); -if (copy_to_user (tmp,&data,16 ) ) -return -EFAULT ; - tmp +=4 ; - *ppos = reg++; - } - -return ((char *)tmp) - buf; +switch (orig) { +case 0 : + file->f_pos = offset; + ret = file->f_pos; +break ; +case 1 : + file->f_pos += offset; + ret = file->f_pos; +break ; +default : + ret = -EINVAL ; + } + +unlock_kernel (); +return ret; +} + +static ssize_t cpuid_read (struct file *file,char *buf, +size_t count,loff_t *ppos) +{ +u32 *tmp = (u32 *)buf; +u32 data[4 ]; +size_t rv; +u32 reg = *ppos; +int cpu =iminor (file->f_dentry->d_inode); + +if (count %16 ) +return -EINVAL ;/* Invalid chunk size */ + +for (rv =0 ; count; count -=16 ) { +do_cpuid (cpu, reg, data); +if (copy_to_user (tmp, &data,16 )) +return -EFAULT ; + tmp +=4 ; + *ppos = reg++; + } + +return ((char *)tmp) - buf; }static int cpuid_open (struct inode *inode,struct file *file) { -int cpu =iminor (file->f_dentry->d_inode); -struct cpuinfo_x86 *c = &(cpu_data)[cpu]; +int cpu =iminor (file->f_dentry->d_inode); +struct cpuinfo_x86 *c = &(cpu_data)[cpu]; + +if (!cpu_online (cpu)) +return -ENXIO ;/* No such CPU */ +if (c->cpuid_level <0 ) +return -EIO ;/* CPUID not supported */ -if (!cpu_online (cpu)) -return -ENXIO ;/* No such CPU */ -if ( c->cpuid_level <0 ) -return -EIO ;/* CPUID not supported */ - -return 0 ; +return 0 ; }/* * File operations we support */ static struct file_operations cpuid_fops = { - .owner =THIS_MODULE , - .llseek = cpuid_seek, - .read = cpuid_read, - .open = cpuid_open, + .owner =THIS_MODULE , + .llseek = cpuid_seek, + .read = cpuid_read, + .open = cpuid_open, };int __init cpuid_init (void ) { -if (register_chrdev (CPUID_MAJOR ,"cpu/cpuid" , &cpuid_fops)) { -printk (KERN_ERR "cpuid: unable to get major %d for cpuid\n" , -CPUID_MAJOR ); -return -EBUSY ; - } +if (register_chrdev (CPUID_MAJOR ,"cpu/cpuid" , &cpuid_fops)) { +printk (KERN_ERR "cpuid: unable to get major %d for cpuid\n" , +CPUID_MAJOR ); +return -EBUSY ; + } -return 0 ; +return 0 ; } void __exit cpuid_exit(void) { -unregister_chrdev (CPUID_MAJOR ,"cpu/cpuid" ); +unregister_chrdev (CPUID_MAJOR ,"cpu/cpuid" ); }module_init (cpuid_init); -module_exit(cpuid_exit) +module_exit (cpuid_exit);MODULE_AUTHOR ("H. Peter Anvin <[email protected]>" );MODULE_DESCRIPTION ("x86 generic CPUID driver" );
arch/i386/kernel/msr.c +152 -154
390 lines not on this page · raw message
Quoted 3 lines · Brian Gerst
Run
cpuid.candmsr.cthrough Lindent to improve readability. The only non-whitespace change was to add a missing semicolon aftermodule_exit().
As much as I had poor/inconsistent formatting, gratuitous whitespace changes are really annoying when you have to deal with merging code across several kernel versions (as I have had to do) and I really prefer to see these things done as the code is fixed/modified.
--cw
Quoted 8 lines · Chris Wedgwood
Quoted 3 lines · Brian Gerst
Run
cpuid.candmsr.cthrough Lindent to improve readability. The only non-whitespace change was to add a missing semicolon aftermodule_exit().
Quoted 4 lines
As much as I had poor/inconsistent formatting, gratuitous whitespace changes are really annoying when you have to deal with merging code across several kernel versions (as I have had to do) and I really prefer to see these things done as the code is fixed/modified.
It's excuses like this that have allowed this crap to endure for so long without getting fixed. What patch do you have for these files that is conflicting? I haven't seen any proposed patches for these two files in a long time, and BK only shows one minor change in the last 6 months, so I didn't feel that I was going to step on anyone's toes with this patch.
--
Brian Gerst