Skip to contentSkip to conversation

s390/char: Fix cdev_add usage

PATCH New Jean Delvare 1 participant 1 message Jul 13, 2016 s390

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390/char: Fix cdev_add usage

As I read the code in function cdev_add, it does set ->dev, so there is no point in setting it prior to calling the function.

Cc Alexander Viro <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>

---
Untested.

 drivers/s390/char/tape_class.c |    3 +--
 drivers/s390/char/vmlogrdr.c   |    3 +--
 drivers/s390/char/vmur.c       |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)
drivers/s390/char/tape_class.c +1 -2
@@ -68,9 +68,8 @@ struct tape_class_device *register_tape_
 
 	tcd->char_device->owner = fops->owner;
 	tcd->char_device->ops   = fops;
-	tcd->char_device->dev   = dev;
 
-	rc = cdev_add(tcd->char_device, tcd->char_device->dev, 1);
+	rc = cdev_add(tcd->char_device, dev, 1);
 	if (rc)
 		goto fail_with_cdev;
 
drivers/s390/char/vmlogrdr.c +1 -2
@@ -815,8 +815,7 @@ static int vmlogrdr_register_cdev(dev_t
 	}
 	vmlogrdr_cdev->owner = THIS_MODULE;
 	vmlogrdr_cdev->ops = &vmlogrdr_fops;
-	vmlogrdr_cdev->dev = dev;
-	rc = cdev_add(vmlogrdr_cdev, vmlogrdr_cdev->dev, MAXMINOR);
+	rc = cdev_add(vmlogrdr_cdev, dev, MAXMINOR);
 	if (!rc)
 		return 0;
 
drivers/s390/char/vmur.c +1 -2
@@ -891,10 +891,9 @@ static int ur_set_online(struct ccw_devi
 	}
 
 	urd->char_device->ops = &ur_fops;
-	urd->char_device->dev = MKDEV(major, minor);
 	urd->char_device->owner = ur_fops.owner;
 
-	rc = cdev_add(urd->char_device, urd->char_device->dev, 1);
+	rc = cdev_add(urd->char_device, MKDEV(major, minor), 1);
 	if (rc)
 		goto fail_free_cdev;
 	if (urd->cdev->id.cu_type == READER_PUNCH_DEVTYPE) {
Signature · 2 lines
Jean Delvare
SUSE L3 Support