projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] cirrus ep93xx watchdog driver
[powerpc.git]
/
drivers
/
char
/
snsc.c
diff --git
a/drivers/char/snsc.c
b/drivers/char/snsc.c
index
261a41b
..
b543821
100644
(file)
--- a/
drivers/char/snsc.c
+++ b/
drivers/char/snsc.c
@@
-5,7
+5,7
@@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 2004 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2004
, 2006
Silicon Graphics, Inc. All rights reserved.
*/
/*
*/
/*
@@
-77,7
+77,7
@@
scdrv_open(struct inode *inode, struct file *file)
scd = container_of(inode->i_cdev, struct sysctl_data_s, scd_cdev);
/* allocate memory for subchannel data */
scd = container_of(inode->i_cdev, struct sysctl_data_s, scd_cdev);
/* allocate memory for subchannel data */
- sd = k
m
alloc(sizeof (struct subch_data_s), GFP_KERNEL);
+ sd = k
z
alloc(sizeof (struct subch_data_s), GFP_KERNEL);
if (sd == NULL) {
printk("%s: couldn't allocate subchannel data\n",
__FUNCTION__);
if (sd == NULL) {
printk("%s: couldn't allocate subchannel data\n",
__FUNCTION__);
@@
-85,7
+85,6
@@
scdrv_open(struct inode *inode, struct file *file)
}
/* initialize subch_data_s fields */
}
/* initialize subch_data_s fields */
- memset(sd, 0, sizeof (struct subch_data_s));
sd->sd_nasid = scd->scd_nasid;
sd->sd_subch = ia64_sn_irtr_open(scd->scd_nasid);
sd->sd_nasid = scd->scd_nasid;
sd->sd_subch = ia64_sn_irtr_open(scd->scd_nasid);
@@
-377,7
+376,7
@@
scdrv_init(void)
dev_t first_dev, dev;
nasid_t event_nasid = ia64_sn_get_console_nasid();
dev_t first_dev, dev;
nasid_t event_nasid = ia64_sn_get_console_nasid();
- if (alloc_chrdev_region(&first_dev, 0, num
io
nodes,
+ if (alloc_chrdev_region(&first_dev, 0, num
_c
nodes,
SYSCTL_BASENAME) < 0) {
printk("%s: failed to register SN system controller device\n",
__FUNCTION__);
SYSCTL_BASENAME) < 0) {
printk("%s: failed to register SN system controller device\n",
__FUNCTION__);
@@
-385,7
+384,7
@@
scdrv_init(void)
}
snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME);
}
snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME);
- for (cnode = 0; cnode < num
io
nodes; cnode++) {
+ for (cnode = 0; cnode < num
_c
nodes; cnode++) {
geoid = cnodeid_get_geoid(cnode);
devnamep = devname;
format_module_id(devnamep, geo_module(geoid),
geoid = cnodeid_get_geoid(cnode);
devnamep = devname;
format_module_id(devnamep, geo_module(geoid),
@@
-394,7
+393,7
@@
scdrv_init(void)
sprintf(devnamep, "#%d", geo_slab(geoid));
/* allocate sysctl device data */
sprintf(devnamep, "#%d", geo_slab(geoid));
/* allocate sysctl device data */
- scd = k
m
alloc(sizeof (struct sysctl_data_s),
+ scd = k
z
alloc(sizeof (struct sysctl_data_s),
GFP_KERNEL);
if (!scd) {
printk("%s: failed to allocate device info"
GFP_KERNEL);
if (!scd) {
printk("%s: failed to allocate device info"
@@
-402,7
+401,6
@@
scdrv_init(void)
SYSCTL_BASENAME, devname);
continue;
}
SYSCTL_BASENAME, devname);
continue;
}
- memset(scd, 0, sizeof (struct sysctl_data_s));
/* initialize sysctl device data fields */
scd->scd_nasid = cnodeid_to_nasid(cnode);
/* initialize sysctl device data fields */
scd->scd_nasid = cnodeid_to_nasid(cnode);
@@
-437,7
+435,7
@@
scdrv_init(void)
continue;
}
continue;
}
- class_device_create(snsc_class, dev, NULL,
+ class_device_create(snsc_class,
NULL,
dev, NULL,
"%s", devname);
ia64_sn_irtr_intr_enable(scd->scd_nasid,
"%s", devname);
ia64_sn_irtr_intr_enable(scd->scd_nasid,