Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea9e42f6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

device create: s390: convert device_create_drvdata to device_create 



Now that device_create() has been audited, rename things back to the
original call to be sane.

Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6e05d6c4

drivers/s390/char/raw3270.c

+6 −8
Original line number Diff line number Diff line
@@ -1168,18 +1168,16 @@ static int raw3270_create_attributes(struct raw3270 *rp) 
	if (rc)

		goto out;



	rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,

					     MKDEV(IBM_TTY3270_MAJOR, rp->minor),

					     NULL,

	rp->clttydev = device_create(class3270, &rp->cdev->dev,

				     MKDEV(IBM_TTY3270_MAJOR, rp->minor), NULL,

				     "tty%s", dev_name(&rp->cdev->dev));

	if (IS_ERR(rp->clttydev)) {

		rc = PTR_ERR(rp->clttydev);

		goto out_ttydev;

	}



	rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,

					     MKDEV(IBM_FS3270_MAJOR, rp->minor),

					     NULL,

	rp->cltubdev = device_create(class3270, &rp->cdev->dev,

				     MKDEV(IBM_FS3270_MAJOR, rp->minor), NULL,

				     "tub%s", dev_name(&rp->cdev->dev));

	if (!IS_ERR(rp->cltubdev))

		goto out;

drivers/s390/char/tape_class.c

+3 −3
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ struct tape_class_device *register_tape_dev( 
	if (rc)

		goto fail_with_cdev;



	tcd->class_device = device_create_drvdata(tape_class, device,

						  tcd->char_device->dev,

						  NULL, "%s", tcd->device_name);

	tcd->class_device = device_create(tape_class, device,

					  tcd->char_device->dev, NULL,

					  "%s", tcd->device_name);

	rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0;

	if (rc)

		goto fail_with_cdev;

drivers/s390/char/vmlogrdr.c

+4 −4
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) 
		device_unregister(dev);

		return ret;

	}

	priv->class_device = device_create_drvdata(vmlogrdr_class, dev,

	priv->class_device = device_create(vmlogrdr_class, dev,

					   MKDEV(vmlogrdr_major,

						 priv->minor_num),

					   priv, "%s", dev_name(dev));

drivers/s390/char/vmur.c

+2 −3
Original line number Diff line number Diff line
@@ -896,9 +896,8 @@ static int ur_set_online(struct ccw_device *cdev) 
		goto fail_free_cdev;

	}



	urd->device = device_create_drvdata(vmur_class, NULL,

					    urd->char_device->dev, NULL,

					    "%s", node_id);

	urd->device = device_create(vmur_class, NULL, urd->char_device->dev,

				    NULL, "%s", node_id);

	if (IS_ERR(urd->device)) {

		rc = PTR_ERR(urd->device);

		TRACE("ur_set_online: device_create rc=%d\n", rc);