[POWERPC] Sky Cpu and Nexus: code style improvement
Remove useless spaces and adds some empty lines to make code more readable. Also marker for printk is added. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Kumar Gala <galak@gate.crashing.org> Cc: Brian Waite <waite@skycomputers.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
8150caad02
commit
a4e32b5f0a
2 changed files with 31 additions and 31 deletions
|
@ -169,22 +169,21 @@ static struct platform_driver hdpu_cpustate_driver = {
|
||||||
* The various file operations we support.
|
* The various file operations we support.
|
||||||
*/
|
*/
|
||||||
static const struct file_operations cpustate_fops = {
|
static const struct file_operations cpustate_fops = {
|
||||||
owner:THIS_MODULE,
|
owner: THIS_MODULE,
|
||||||
open:cpustate_open,
|
open: cpustate_open,
|
||||||
release:cpustate_release,
|
release: cpustate_release,
|
||||||
read:cpustate_read,
|
read: cpustate_read,
|
||||||
write:cpustate_write,
|
write: cpustate_write,
|
||||||
fasync:NULL,
|
fasync: NULL,
|
||||||
poll:NULL,
|
poll: NULL,
|
||||||
ioctl:NULL,
|
ioctl: NULL,
|
||||||
llseek:no_llseek,
|
llseek: no_llseek,
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct miscdevice cpustate_dev = {
|
static struct miscdevice cpustate_dev = {
|
||||||
MISC_DYNAMIC_MINOR,
|
MISC_DYNAMIC_MINOR,
|
||||||
"sky_cpustate",
|
"sky_cpustate",
|
||||||
&cpustate_fops
|
&cpustate_fops,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int hdpu_cpustate_probe(struct platform_device *pdev)
|
static int hdpu_cpustate_probe(struct platform_device *pdev)
|
||||||
|
@ -199,8 +198,8 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
ret = misc_register(&cpustate_dev);
|
ret = misc_register(&cpustate_dev);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
printk(KERN_WARNING "sky_cpustate: Unable to register misc "
|
printk(KERN_WARNING "sky_cpustate: "
|
||||||
"device.\n");
|
"Unable to register misc device.\n");
|
||||||
cpustate.set_addr = NULL;
|
cpustate.set_addr = NULL;
|
||||||
cpustate.clr_addr = NULL;
|
cpustate.clr_addr = NULL;
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -209,8 +208,8 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
|
||||||
proc_de = create_proc_read_entry("sky_cpustate", 0, 0,
|
proc_de = create_proc_read_entry("sky_cpustate", 0, 0,
|
||||||
cpustate_read_proc, NULL);
|
cpustate_read_proc, NULL);
|
||||||
if (proc_de == NULL)
|
if (proc_de == NULL)
|
||||||
printk(KERN_WARNING "sky_cpustate: Unable to create proc "
|
printk(KERN_WARNING "sky_cpustate: "
|
||||||
"dir entry\n");
|
"Unable to create proc dir entry\n");
|
||||||
|
|
||||||
printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n");
|
printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -218,21 +217,18 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
static int hdpu_cpustate_remove(struct platform_device *pdev)
|
static int hdpu_cpustate_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
|
|
||||||
cpustate.set_addr = NULL;
|
cpustate.set_addr = NULL;
|
||||||
cpustate.clr_addr = NULL;
|
cpustate.clr_addr = NULL;
|
||||||
|
|
||||||
remove_proc_entry("sky_cpustate", NULL);
|
remove_proc_entry("sky_cpustate", NULL);
|
||||||
misc_deregister(&cpustate_dev);
|
misc_deregister(&cpustate_dev);
|
||||||
return 0;
|
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init cpustate_init(void)
|
static int __init cpustate_init(void)
|
||||||
{
|
{
|
||||||
int rc;
|
return platform_driver_register(&hdpu_cpustate_driver);
|
||||||
rc = platform_driver_register(&hdpu_cpustate_driver);
|
|
||||||
return rc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __exit cpustate_exit(void)
|
static void __exit cpustate_exit(void)
|
||||||
|
|
|
@ -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 hdpu_slot_id_read(char *buffer, char **buffer_location, off_t offset,
|
||||||
int buffer_length, int *zero, void *ptr)
|
int buffer_length, int *zero, void *ptr)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (offset > 0)
|
if (offset > 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return sprintf(buffer, "%d\n", slot_id);
|
return sprintf(buffer, "%d\n", slot_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
int hdpu_chassis_id_read(char *buffer, char **buffer_location, off_t offset,
|
int hdpu_chassis_id_read(char *buffer, char **buffer_location, off_t offset,
|
||||||
int buffer_length, int *zero, void *ptr)
|
int buffer_length, int *zero, void *ptr)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (offset > 0)
|
if (offset > 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return sprintf(buffer, "%d\n", chassis_id);
|
return sprintf(buffer, "%d\n", chassis_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hdpu_nexus_probe(struct platform_device *pdev)
|
static int hdpu_nexus_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
|
int *nexus_id_addr;
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
int *nexus_id_addr;
|
nexus_id_addr = ioremap(res->start,
|
||||||
nexus_id_addr =
|
(unsigned long)(res->end - res->start));
|
||||||
ioremap(res->start, (unsigned long)(res->end - res->start));
|
|
||||||
if (nexus_id_addr) {
|
if (nexus_id_addr) {
|
||||||
slot_id = (*nexus_id_addr >> 8) & 0x1f;
|
slot_id = (*nexus_id_addr >> 8) & 0x1f;
|
||||||
chassis_id = *nexus_id_addr & 0xff;
|
chassis_id = *nexus_id_addr & 0xff;
|
||||||
iounmap(nexus_id_addr);
|
iounmap(nexus_id_addr);
|
||||||
} else
|
} else {
|
||||||
printk("Could not map slot id\n");
|
printk(KERN_ERR "Could not map slot id\n");
|
||||||
|
}
|
||||||
|
|
||||||
hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, &proc_root);
|
hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, &proc_root);
|
||||||
hdpu_slot_id->read_proc = hdpu_slot_id_read;
|
hdpu_slot_id->read_proc = hdpu_slot_id_read;
|
||||||
|
|
||||||
hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, &proc_root);
|
hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, &proc_root);
|
||||||
hdpu_chassis_id->read_proc = hdpu_chassis_id_read;
|
hdpu_chassis_id->read_proc = hdpu_chassis_id_read;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,18 +84,19 @@ static int hdpu_nexus_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
slot_id = -1;
|
slot_id = -1;
|
||||||
chassis_id = -1;
|
chassis_id = -1;
|
||||||
|
|
||||||
remove_proc_entry("sky_slot_id", &proc_root);
|
remove_proc_entry("sky_slot_id", &proc_root);
|
||||||
remove_proc_entry("sky_chassis_id", &proc_root);
|
remove_proc_entry("sky_chassis_id", &proc_root);
|
||||||
|
|
||||||
hdpu_slot_id = 0;
|
hdpu_slot_id = 0;
|
||||||
hdpu_chassis_id = 0;
|
hdpu_chassis_id = 0;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init nexus_init(void)
|
static int __init nexus_init(void)
|
||||||
{
|
{
|
||||||
int rc;
|
return platform_driver_register(&hdpu_nexus_driver);
|
||||||
rc = platform_driver_register(&hdpu_nexus_driver);
|
|
||||||
return rc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __exit nexus_exit(void)
|
static void __exit nexus_exit(void)
|
||||||
|
|
Reference in a new issue