I seem to recall the discussion about this, but very dimly. Would someone
be so kind to remind me, why the attached patch cannot be used?
-- Pete
diff -urp -X dontdiff linux-2.6.14-rc5/drivers/s390/char/vmlogrdr.c linux-2.6.14-rc5-lem/drivers/s390/char/vmlogrdr.c
--- linux-2.6.14-rc5/drivers/s390/char/vmlogrdr.c 2005-09-13 01:06:11.000000000 -0700
+++ linux-2.6.14-rc5-lem/drivers/s390/char/vmlogrdr.c 2005-10-24 20:05:26.000000000 -0700
@@ -74,7 +74,7 @@ struct vmlogrdr_priv_t {
int buffer_free;
int dev_in_use; /* 1: already opened, 0: not opened*/
spinlock_t priv_lock;
- struct device *device;
+ struct device device;
struct class_device *class_device;
int autorecording;
int autopurge;
@@ -756,27 +756,14 @@ vmlogrdr_unregister_driver(void) {
static int
vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) {
- struct device *dev;
+ struct device *dev = &priv->device;
int ret;
- dev = kmalloc(sizeof(struct device), GFP_KERNEL);
- if (dev) {
- memset(dev, 0, sizeof(struct device));
- snprintf(dev->bus_id, BUS_ID_SIZE, "%s",
- priv->internal_name);
- dev->bus = &iucv_bus;
- dev->parent = iucv_root;
- dev->driver = &vmlogrdr_driver;
- /*
- * The release function could be called after the
- * module has been unloaded. It's _only_ task is to
- * free the struct. Therefore, we specify kfree()
- * directly here. (Probably a little bit obfuscating
- * but legitime ...).
- */
- dev->release = (void (*)(struct device *))kfree;
- } else
- return -ENOMEM;
+ memset(dev, 0, sizeof(struct device));
+ snprintf(dev->bus_id, BUS_ID_SIZE, "%s", priv->internal_name);
+ dev->bus = &iucv_bus;
+ dev->parent = iucv_root;
+ dev->driver = &vmlogrdr_driver;
ret = device_register(dev);
if (ret)
return ret;
@@ -799,7 +786,6 @@ vmlogrdr_register_device(struct vmlogrdr
return ret;
}
dev->driver_data = priv;
- priv->device = dev;
return 0;
}
@@ -807,11 +793,8 @@ vmlogrdr_register_device(struct vmlogrdr
static int
vmlogrdr_unregister_device(struct vmlogrdr_priv_t *priv ) {
class_device_destroy(vmlogrdr_class, MKDEV(vmlogrdr_major, priv->minor_num));
- if (priv->device != NULL) {
- sysfs_remove_group(&priv->device->kobj, &vmlogrdr_attr_group);
- device_unregister(priv->device);
- priv->device=NULL;
- }
+ sysfs_remove_group(&priv->device.kobj, &vmlogrdr_attr_group);
+ device_unregister(&priv->device);
return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
