|
@@ -48,8 +48,8 @@ struct raw3270 {
|
|
|
struct timer_list timer; /* Device timer. */
|
|
|
|
|
|
unsigned char *ascebc; /* ascii -> ebcdic table */
|
|
|
- struct class_device *clttydev; /* 3270-class tty device ptr */
|
|
|
- struct class_device *cltubdev; /* 3270-class tub device ptr */
|
|
|
+ struct device *clttydev; /* 3270-class tty device ptr */
|
|
|
+ struct device *cltubdev; /* 3270-class tub device ptr */
|
|
|
|
|
|
struct raw3270_request init_request;
|
|
|
unsigned char init_data[256];
|
|
@@ -1107,11 +1107,9 @@ raw3270_delete_device(struct raw3270 *rp)
|
|
|
/* Remove from device chain. */
|
|
|
mutex_lock(&raw3270_mutex);
|
|
|
if (rp->clttydev && !IS_ERR(rp->clttydev))
|
|
|
- class_device_destroy(class3270,
|
|
|
- MKDEV(IBM_TTY3270_MAJOR, rp->minor));
|
|
|
+ device_destroy(class3270, MKDEV(IBM_TTY3270_MAJOR, rp->minor));
|
|
|
if (rp->cltubdev && !IS_ERR(rp->cltubdev))
|
|
|
- class_device_destroy(class3270,
|
|
|
- MKDEV(IBM_FS3270_MAJOR, rp->minor));
|
|
|
+ device_destroy(class3270, MKDEV(IBM_FS3270_MAJOR, rp->minor));
|
|
|
list_del_init(&rp->list);
|
|
|
mutex_unlock(&raw3270_mutex);
|
|
|
|
|
@@ -1181,24 +1179,22 @@ static int raw3270_create_attributes(struct raw3270 *rp)
|
|
|
if (rc)
|
|
|
goto out;
|
|
|
|
|
|
- rp->clttydev = class_device_create(class3270, NULL,
|
|
|
- MKDEV(IBM_TTY3270_MAJOR, rp->minor),
|
|
|
- &rp->cdev->dev, "tty%s",
|
|
|
- rp->cdev->dev.bus_id);
|
|
|
+ rp->clttydev = device_create(class3270, &rp->cdev->dev,
|
|
|
+ MKDEV(IBM_TTY3270_MAJOR, rp->minor),
|
|
|
+ "tty%s", rp->cdev->dev.bus_id);
|
|
|
if (IS_ERR(rp->clttydev)) {
|
|
|
rc = PTR_ERR(rp->clttydev);
|
|
|
goto out_ttydev;
|
|
|
}
|
|
|
|
|
|
- rp->cltubdev = class_device_create(class3270, NULL,
|
|
|
- MKDEV(IBM_FS3270_MAJOR, rp->minor),
|
|
|
- &rp->cdev->dev, "tub%s",
|
|
|
- rp->cdev->dev.bus_id);
|
|
|
+ rp->cltubdev = device_create(class3270, &rp->cdev->dev,
|
|
|
+ MKDEV(IBM_FS3270_MAJOR, rp->minor),
|
|
|
+ "tub%s", rp->cdev->dev.bus_id);
|
|
|
if (!IS_ERR(rp->cltubdev))
|
|
|
goto out;
|
|
|
|
|
|
rc = PTR_ERR(rp->cltubdev);
|
|
|
- class_device_destroy(class3270, MKDEV(IBM_TTY3270_MAJOR, rp->minor));
|
|
|
+ device_destroy(class3270, MKDEV(IBM_TTY3270_MAJOR, rp->minor));
|
|
|
|
|
|
out_ttydev:
|
|
|
sysfs_remove_group(&rp->cdev->dev.kobj, &raw3270_attr_group);
|