Sky Cpu and Nexus: code style improvement
PATCH 1/4 Sky Cpu and Nexus: code style improvement
This patch removes useless spaces and adds
some empty lines to make code more readable.
Also marker for printk is added.
---
drivers/misc/hdpuftrs/hdpu_cpustate.c | 51 +++++++++++++++----------------- drivers/misc/hdpuftrs/hdpu_nexus.c | 24 +++++++++------ 2 files changed, 38 insertions(+), 37 deletions(-)
@@ -169,22 +170,21 @@ static struct platform_driver hdpu_cpustate_driver = {
* The various file operations we support.
*/
static const struct file_operations cpustate_fops = {
- owner:THIS_MODULE, - open:cpustate_open, - release:cpustate_release, - read:cpustate_read, - write:cpustate_write, - fasync:NULL, - poll:NULL, - ioctl:NULL, - llseek:no_llseek, - + owner: THIS_MODULE, + open: cpustate_open, + release: cpustate_release, + read: cpustate_read, + write: cpustate_write, + fasync: NULL, + poll: NULL, + ioctl: NULL, + llseek: no_llseek,
};
static struct miscdevice cpustate_dev = {
MISC_DYNAMIC_MINOR,
"sky_cpustate",
- &cpustate_fops
+ &cpustate_fops,
};
static int hdpu_cpustate_probe(struct platform_device *pdev)
@@ -199,18 +199,18 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
ret = misc_register(&cpustate_dev);
if (ret) {
- printk(KERN_WARNING "sky_cpustate: Unable to register misc "
- "device.\n");
+ printk(KERN_WARNING "sky_cpustate: "
+ "Unable to register misc device.\n");
cpustate.set_addr = NULL;
cpustate.clr_addr = NULL;
return ret;
}
proc_de = create_proc_read_entry("sky_cpustate", 0, 0,
- cpustate_read_proc, NULL);
+ cpustate_read_proc, NULL);
if (proc_de == NULL)
- printk(KERN_WARNING "sky_cpustate: Unable to create proc "
- "dir entry\n");
+ printk(KERN_WARNING "sky_cpustate: "
+ "Unable to create proc dir entry\n");
printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n"); return 0;
@@ -218,21 +218,18 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
static int hdpu_cpustate_remove(struct platform_device *pdev) {
-
cpustate.set_addr = NULL;
cpustate.clr_addr = NULL;
remove_proc_entry("sky_cpustate", NULL);
misc_deregister(&cpustate_dev);
- return 0;
+ return 0;
}
static int __init cpustate_init(void)
{
- int rc;
- rc = platform_driver_register(&hdpu_cpustate_driver);
- return rc;
+ return platform_driver_register(&hdpu_cpustate_driver);
}
static void __exit cpustate_exit(void)
drivers/misc/hdpuftrs/hdpu_nexus.c +14 -10
@@ -40,40 +40,43 @@ static struct platform_driver hdpu_nexus_driver = {int hdpu_slot_id_read (char *buffer,char **buffer_location,off_t offset,int buffer_length,int *zero,void *ptr) { -if (offset >0 )return 0 ; +return sprintf (buffer,"%d\n" , slot_id); }int hdpu_chassis_id_read (char *buffer,char **buffer_location,off_t offset,int buffer_length,int *zero,void *ptr) { -if (offset >0 )return 0 ; +return sprintf (buffer,"%d\n" , chassis_id); }static int hdpu_nexus_probe (struct platform_device *pdev) {struct resource *res; +int *nexus_id_addr; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -int *nexus_id_addr; - nexus_id_addr = -ioremap (res->start, (unsigned long )(res->end - res->start)); + nexus_id_addr =ioremap (res->start, + (unsigned long )(res->end - res->start));if (nexus_id_addr) { slot_id = (*nexus_id_addr >>8 ) &0x1f ; chassis_id = *nexus_id_addr &0xff ;iounmap (nexus_id_addr); - }else -printk ("Could not map slot id\n" ); + }else { +printk (KERN_ERR "Could not map slot id\n" ); + } + hdpu_slot_id =create_proc_entry ("sky_slot_id" ,0666 , &proc_root); hdpu_slot_id->read_proc = hdpu_slot_id_read; hdpu_chassis_id =create_proc_entry ("sky_chassis_id" ,0666 , &proc_root); hdpu_chassis_id->read_proc = hdpu_chassis_id_read; +return 0 ; }
@@ -81,18 +84,19 @@ static int hdpu_nexus_remove(struct platform_device *pdev) { slot_id =-1 ; chassis_id =-1 ; +remove_proc_entry ("sky_slot_id" , &proc_root);remove_proc_entry ("sky_chassis_id" , &proc_root); + hdpu_slot_id =0 ; hdpu_chassis_id =0 ; +return 0 ; }static int __init nexus_init (void ) { -int rc; - rc =platform_driver_register (&hdpu_nexus_driver); -return rc; +return platform_driver_register (&hdpu_nexus_driver); } static void __exit nexus_exit(void)
Quoted 25 lines · On Thu, 5 Jul 2007 20:54:20 +0400 Cyrill Gorcunov <[email protected]> wrote:
This patch removes useless spaces and adds
some empty lines to make code more readable.
Also marker for printk is added.Signed-off-by Cyrill Gorcunov <[email protected]>---
drivers/misc/hdpuftrs/hdpu_cpustate.c | 51 +++++++++++++++----------------- drivers/misc/hdpuftrs/hdpu_nexus.c | 24 +++++++++------ 2 files changed, 38 insertions(+), 37 deletions(-)(quoted diff) +0
-10@@ -169,22 +170,21 @@ static struct platform_driver hdpu_cpustate_driver = { * The various file operations we support. */ static const struct file_operations cpustate_fops = { - owner:THIS_MODULE, - open:cpustate_open, - release:cpustate_release, - read:cpustate_read, - write:cpustate_write, - fasync:NULL, - poll:NULL, - ioctl:NULL, - llseek:no_llseek, -
Review static struct platform_driver hdpu_cpustate_driver = { · line 182
Quoted 10 lines
(quoted diff) +9
-0+ owner: THIS_MODULE, + open: cpustate_open, + release: cpustate_release, + read: cpustate_read, + write: cpustate_write, + fasync: NULL, + poll: NULL, + ioctl: NULL, + llseek: no_llseek, };
Please use C99 initializer instead of GCC format
.owner = THIS_MODULE,
...
Review static struct platform_driver hdpu_cpustate_driver = { · line 187
Quoted 7 lines
(quoted diff) +1
-1static struct miscdevice cpustate_dev = { MISC_DYNAMIC_MINOR, "sky_cpustate", - &cpustate_fops + &cpustate_fops, };
Use C99 format so that if miscdevice changes element order, the code doesn't break.
Quoted 15 lines
(quoted diff) +2
-2static int hdpu_cpustate_probe(struct platform_device *pdev)@@ -199,18 +199,18 @@ static int hdpu_cpustate_probe(struct platform_device *pdev) ret = misc_register(&cpustate_dev); if (ret) { - printk(KERN_WARNING "sky_cpustate: Unable to register misc " - "device.\n"); + printk(KERN_WARNING "sky_cpustate: " + "Unable to register misc device.\n"); cpustate.set_addr = NULL; cpustate.clr_addr = NULL; return ret; } proc_de = create_proc_read_entry("sky_cpustate", 0, 0,
Review static int hdpu_cpustate_probe(struct platform_device *pdev) · line 216
Quoted 10 lines
(quoted diff) +3
-3- cpustate_read_proc, NULL); + cpustate_read_proc, NULL); if (proc_de == NULL) - printk(KERN_WARNING "sky_cpustate: Unable to create proc " - "dir entry\n"); + printk(KERN_WARNING "sky_cpustate: " + "Unable to create proc dir entry\n"); printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n"); return 0;
Consider changing the proc interface to seq_file/single_open usage.
Quoted 102 lines
(quoted diff) +2
-5@@ -218,21 +218,18 @@ static int hdpu_cpustate_probe(struct platform_device *pdev) static int hdpu_cpustate_remove(struct platform_device *pdev) { - cpustate.set_addr = NULL; cpustate.clr_addr = NULL; remove_proc_entry("sky_cpustate", NULL); misc_deregister(&cpustate_dev); - return 0; + return 0; } static int __init cpustate_init(void) { - int rc; - rc = platform_driver_register(&hdpu_cpustate_driver); - return rc; + return platform_driver_register(&hdpu_cpustate_driver); } static void __exit cpustate_exit(void)drivers/misc/hdpuftrs/hdpu_nexus.c +14
-10@@ -40,40 +40,43 @@ static struct platform_driver hdpu_nexus_driver = {int hdpu_slot_id_read (char *buffer,char **buffer_location,off_t offset,int buffer_length,int *zero,void *ptr) { -if (offset >0 )return 0 ; +return sprintf (buffer,"%d\n" , slot_id); }int hdpu_chassis_id_read (char *buffer,char **buffer_location,off_t offset,int buffer_length,int *zero,void *ptr) { -if (offset >0 )return 0 ; +return sprintf (buffer,"%d\n" , chassis_id); }static int hdpu_nexus_probe (struct platform_device *pdev) {struct resource *res; +int *nexus_id_addr; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -int *nexus_id_addr; - nexus_id_addr = -ioremap (res->start, (unsigned long )(res->end - res->start)); + nexus_id_addr =ioremap (res->start, + (unsigned long )(res->end - res->start));if (nexus_id_addr) { slot_id = (*nexus_id_addr >>8 ) &0x1f ; chassis_id = *nexus_id_addr &0xff ;iounmap (nexus_id_addr); - }else -printk ("Could not map slot id\n" ); + }else { +printk (KERN_ERR "Could not map slot id\n" ); + } + hdpu_slot_id =create_proc_entry ("sky_slot_id" ,0666 , &proc_root); hdpu_slot_id->read_proc = hdpu_slot_id_read; hdpu_chassis_id =create_proc_entry ("sky_chassis_id" ,0666 , &proc_root); hdpu_chassis_id->read_proc = hdpu_chassis_id_read; +return 0 ; }@@ -81,18 +84,19 @@ static int hdpu_nexus_remove(struct platform_device *pdev) { slot_id =-1 ; chassis_id =-1 ; +remove_proc_entry ("sky_slot_id" , &proc_root);remove_proc_entry ("sky_chassis_id" , &proc_root); + hdpu_slot_id =0 ; hdpu_chassis_id =0 ; +return 0 ; }static int __init nexus_init (void ) { -int rc; - rc =platform_driver_register (&hdpu_nexus_driver); -return rc; +return platform_driver_register (&hdpu_nexus_driver); } static void __exit nexus_exit(void)
Signature · 1 line
Stephen Hemminger <[email protected]>