diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 23:03:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 12:24:44 -0400 |
commit | ea9e42f627a45f979b4977009724eb114406e3c7 (patch) | |
tree | a44ace4e1485a165d6d354596a8ddfc5a70f86d3 /drivers/s390/char/raw3270.c | |
parent | 6e05d6c4676408b46b01eef29fd472b89ba1f98a (diff) |
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>
Diffstat (limited to 'drivers/s390/char/raw3270.c')
-rw-r--r-- | drivers/s390/char/raw3270.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index 1792b2c0130e..0b15cf107ec9 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c | |||
@@ -1168,19 +1168,17 @@ static int raw3270_create_attributes(struct raw3270 *rp) | |||
1168 | if (rc) | 1168 | if (rc) |
1169 | goto out; | 1169 | goto out; |
1170 | 1170 | ||
1171 | rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev, | 1171 | rp->clttydev = device_create(class3270, &rp->cdev->dev, |
1172 | MKDEV(IBM_TTY3270_MAJOR, rp->minor), | 1172 | MKDEV(IBM_TTY3270_MAJOR, rp->minor), NULL, |
1173 | NULL, | 1173 | "tty%s", dev_name(&rp->cdev->dev)); |
1174 | "tty%s", dev_name(&rp->cdev->dev)); | ||
1175 | if (IS_ERR(rp->clttydev)) { | 1174 | if (IS_ERR(rp->clttydev)) { |
1176 | rc = PTR_ERR(rp->clttydev); | 1175 | rc = PTR_ERR(rp->clttydev); |
1177 | goto out_ttydev; | 1176 | goto out_ttydev; |
1178 | } | 1177 | } |
1179 | 1178 | ||
1180 | rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev, | 1179 | rp->cltubdev = device_create(class3270, &rp->cdev->dev, |
1181 | MKDEV(IBM_FS3270_MAJOR, rp->minor), | 1180 | MKDEV(IBM_FS3270_MAJOR, rp->minor), NULL, |
1182 | NULL, | 1181 | "tub%s", dev_name(&rp->cdev->dev)); |
1183 | "tub%s", dev_name(&rp->cdev->dev)); | ||
1184 | if (!IS_ERR(rp->cltubdev)) | 1182 | if (!IS_ERR(rp->cltubdev)) |
1185 | goto out; | 1183 | goto out; |
1186 | 1184 | ||