Use kobject_set_name() for increased portability.
As of 2.6.25 kobj->k_name was replaced with kobj->name. Some distros such as RHEL5 (2.6.18) add a patch to prevent this from being a problem but other older distros such as SLES10 (2.6.16) have not. To avoid the whole issue I'm updating the code to use kobject_set_name() which does what I want and has existed all the way back to 2.6.11.
This commit is contained in:
parent
51a727e90f
commit
39ab544079
@ -590,6 +590,7 @@ static loff_t splat_seek(struct file *file, loff_t offset, int origin)
|
||||
return rc;
|
||||
}
|
||||
|
||||
static struct cdev splat_cdev;
|
||||
static struct file_operations splat_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = splat_open,
|
||||
@ -603,11 +604,6 @@ static struct file_operations splat_fops = {
|
||||
.llseek = splat_seek,
|
||||
};
|
||||
|
||||
static struct cdev splat_cdev = {
|
||||
.owner = THIS_MODULE,
|
||||
.kobj = { .name = SPLAT_NAME, },
|
||||
};
|
||||
|
||||
static int
|
||||
splat_init(void)
|
||||
{
|
||||
@ -638,6 +634,8 @@ splat_init(void)
|
||||
|
||||
/* Support for registering a character driver */
|
||||
cdev_init(&splat_cdev, &splat_fops);
|
||||
splat_cdev.owner = THIS_MODULE;
|
||||
kobject_set_name(&splat_cdev.kobj, SPLAT_NAME);
|
||||
if ((rc = cdev_add(&splat_cdev, dev, SPLAT_MINORS))) {
|
||||
printk(KERN_ERR "SPLAT: Error adding cdev, %d\n", rc);
|
||||
kobject_put(&splat_cdev.kobj);
|
||||
|
Loading…
Reference in New Issue
Block a user