Skip to content

Commit

Permalink
[POWERPC] Sky Cpu and Nexus: code style improvement
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Cyrill Gorcunov authored and Paul Mackerras committed Oct 3, 2007
1 parent 8150caa commit a4e32b5
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
38 changes: 17 additions & 21 deletions drivers/misc/hdpuftrs/hdpu_cpustate.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,22 +169,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)
Expand All @@ -199,40 +198,37 @@ 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;
}

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)
Expand Down
24 changes: 14 additions & 10 deletions drivers/misc/hdpuftrs/hdpu_nexus.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,59 +40,63 @@ 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;
}

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)
Expand Down

0 comments on commit a4e32b5

Please sign in to comment.