openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-07-21 20:03:34 -07:00
parent 6e05d6c467
commit ea9e42f627
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/s390/char/raw3270.c
View File

@ -1168,19 +1168,17 @@ static int raw3270_create_attributes(struct raw3270 *rp)
if (rc) if (rc)
goto out; goto out;
rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev, rp->clttydev = device_create(class3270, &rp->cdev->dev,
MKDEV(IBM_TTY3270_MAJOR, rp->minor), MKDEV(IBM_TTY3270_MAJOR, rp->minor), NULL,
NULL, "tty%s", dev_name(&rp->cdev->dev));
"tty%s", dev_name(&rp->cdev->dev));
if (IS_ERR(rp->clttydev)) { if (IS_ERR(rp->clttydev)) {
rc = PTR_ERR(rp->clttydev); rc = PTR_ERR(rp->clttydev);
goto out_ttydev; goto out_ttydev;
} }
rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev, rp->cltubdev = device_create(class3270, &rp->cdev->dev,
MKDEV(IBM_FS3270_MAJOR, rp->minor), MKDEV(IBM_FS3270_MAJOR, rp->minor), NULL,
NULL, "tub%s", dev_name(&rp->cdev->dev));
"tub%s", dev_name(&rp->cdev->dev));
if (!IS_ERR(rp->cltubdev)) if (!IS_ERR(rp->cltubdev))
goto out; goto out;

6
drivers/s390/char/tape_class.c
View File

@ -69,9 +69,9 @@ struct tape_class_device *register_tape_dev(
if (rc) if (rc)
goto fail_with_cdev; goto fail_with_cdev;
tcd->class_device = device_create_drvdata(tape_class, device, tcd->class_device = device_create(tape_class, device,
tcd->char_device->dev, tcd->char_device->dev, NULL,
NULL, "%s", tcd->device_name); "%s", tcd->device_name);
rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0; rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0;
if (rc) if (rc)
goto fail_with_cdev; goto fail_with_cdev;

8
drivers/s390/char/vmlogrdr.c
View File

@ -747,10 +747,10 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
device_unregister(dev); device_unregister(dev);
return ret; return ret;
} }
priv->class_device = device_create_drvdata(vmlogrdr_class, dev, priv->class_device = device_create(vmlogrdr_class, dev,
MKDEV(vmlogrdr_major, MKDEV(vmlogrdr_major,
priv->minor_num), priv->minor_num),
priv, "%s", dev_name(dev)); priv, "%s", dev_name(dev));
if (IS_ERR(priv->class_device)) { if (IS_ERR(priv->class_device)) {
ret = PTR_ERR(priv->class_device); ret = PTR_ERR(priv->class_device);
priv->class_device=NULL; priv->class_device=NULL;

5
drivers/s390/char/vmur.c
View File

@ -896,9 +896,8 @@ static int ur_set_online(struct ccw_device *cdev)
goto fail_free_cdev; goto fail_free_cdev;
} }
urd->device = device_create_drvdata(vmur_class, NULL, urd->device = device_create(vmur_class, NULL, urd->char_device->dev,
urd->char_device->dev, NULL, NULL, "%s", node_id);
"%s", node_id);
if (IS_ERR(urd->device)) { if (IS_ERR(urd->device)) {
rc = PTR_ERR(urd->device); rc = PTR_ERR(urd->device);
TRACE("ur_set_online: device_create rc=%d\n", rc); TRACE("ur_set_online: device_create rc=%d\n", rc);