6 files changed, 41 insertions, 44 deletions

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 2edd5fb6d3dc..8d1c64a24dec 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -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);
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index 2e0d29730b67..aa7f166f4034 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -69,12 +69,9 @@ struct tape_class_device *register_tape_dev(
         if (rc)
                 goto fail_with_cdev;
 
-        tcd->class_device = class_device_create(
-                                tape_class,
-                                NULL,
-                                tcd->char_device->dev,
-                                device,
-                                "%s", tcd->device_name
+        tcd->class_device = device_create(tape_class, device,
+                                          tcd->char_device->dev,
+                                          "%s", tcd->device_name
                         );
         rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0;
         if (rc)
@@ -90,7 +87,7 @@ struct tape_class_device *register_tape_dev(
         return tcd;
 
 fail_with_class_device:
-        class_device_destroy(tape_class, tcd->char_device->dev);
+        device_destroy(tape_class, tcd->char_device->dev);
 
 fail_with_cdev:
         cdev_del(tcd->char_device);
@@ -105,11 +102,9 @@ EXPORT_SYMBOL(register_tape_dev);
 void unregister_tape_dev(struct tape_class_device *tcd)
 {
         if (tcd != NULL && !IS_ERR(tcd)) {
-                sysfs_remove_link(
-                        &tcd->class_device->dev->kobj,
-                        tcd->mode_name
-                );
-                class_device_destroy(tape_class, tcd->char_device->dev);
+                sysfs_remove_link(&tcd->class_device->kobj,
+                                  tcd->mode_name);
+                device_destroy(tape_class, tcd->char_device->dev);
                 cdev_del(tcd->char_device);
                 kfree(tcd);
         }
diff --git a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h
index a8bd9b47fad6..e2b5ac918acf 100644
--- a/drivers/s390/char/tape_class.h
+++ b/drivers/s390/char/tape_class.h
@@ -24,8 +24,8 @@
 #define TAPECLASS_NAME_LEN      32
 
 struct tape_class_device {
-        struct cdev *           char_device;
-        struct class_device *   class_device;
+        struct cdev             *char_device;
+        struct device           *class_device;
         char                    device_name[TAPECLASS_NAME_LEN];
         char                    mode_name[TAPECLASS_NAME_LEN];
 };
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 12f7a4ce82c1..e0c4c508e121 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -74,7 +74,7 @@ struct vmlogrdr_priv_t {
         int dev_in_use; /* 1: already opened, 0: not opened*/
         spinlock_t priv_lock;
         struct device  *device;
-        struct class_device  *class_device;
+        struct device  *class_device;
         int autorecording;
         int autopurge;
 };
@@ -762,12 +762,10 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
                 device_unregister(dev);
                 return ret;
         }
-        priv->class_device = class_device_create(
-                                vmlogrdr_class,
-                                NULL,
-                                MKDEV(vmlogrdr_major, priv->minor_num),
-                                dev,
-                                "%s", dev->bus_id );
+        priv->class_device = device_create(vmlogrdr_class, dev,
+                                           MKDEV(vmlogrdr_major,
+                                                 priv->minor_num),
+                                           "%s", dev->bus_id);
         if (IS_ERR(priv->class_device)) {
                 ret = PTR_ERR(priv->class_device);
                 priv->class_device=NULL;
@@ -783,8 +781,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
 
 static int vmlogrdr_unregister_device(struct vmlogrdr_priv_t *priv)
 {
-        class_device_destroy(vmlogrdr_class,
-                             MKDEV(vmlogrdr_major, priv->minor_num));
+        device_destroy(vmlogrdr_class, MKDEV(vmlogrdr_major, priv->minor_num));
         if (priv->device != NULL) {
                 sysfs_remove_group(&priv->device->kobj, &vmlogrdr_attr_group);
                 device_unregister(priv->device);
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index 42c1f4659adb..297cdceb0ca4 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -246,7 +246,7 @@ int chp_add_cmg_attr(struct channel_path *chp)
 static ssize_t chp_status_show(struct device *dev,
                                struct device_attribute *attr, char *buf)
 {
-        struct channel_path *chp = container_of(dev, struct channel_path, dev);
+        struct channel_path *chp = to_channelpath(dev);
 
         if (!chp)
                 return 0;
@@ -258,7 +258,7 @@ static ssize_t chp_status_write(struct device *dev,
                                 struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
-        struct channel_path *cp = container_of(dev, struct channel_path, dev);
+        struct channel_path *cp = to_channelpath(dev);
         char cmd[10];
         int num_args;
         int error;
@@ -286,7 +286,7 @@ static ssize_t chp_configure_show(struct device *dev,
         struct channel_path *cp;
         int status;
 
-        cp = container_of(dev, struct channel_path, dev);
+        cp = to_channelpath(dev);
         status = chp_info_get_status(cp->chpid);
         if (status < 0)
                 return status;
@@ -308,7 +308,7 @@ static ssize_t chp_configure_write(struct device *dev,
                 return -EINVAL;
         if (val != 0 && val != 1)
                 return -EINVAL;
-        cp = container_of(dev, struct channel_path, dev);
+        cp = to_channelpath(dev);
         chp_cfg_schedule(cp->chpid, val);
         cfg_wait_idle();
 
@@ -320,7 +320,7 @@ static DEVICE_ATTR(configure, 0644, chp_configure_show, chp_configure_write);
 static ssize_t chp_type_show(struct device *dev, struct device_attribute *attr,
                              char *buf)
 {
-        struct channel_path *chp = container_of(dev, struct channel_path, dev);
+        struct channel_path *chp = to_channelpath(dev);
 
         if (!chp)
                 return 0;
@@ -374,7 +374,7 @@ static void chp_release(struct device *dev)
 {
         struct channel_path *cp;
 
-        cp = container_of(dev, struct channel_path, dev);
+        cp = to_channelpath(dev);
         kfree(cp);
 }
 
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 5d83dd471461..838f7ac0dc32 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -182,6 +182,15 @@ static int css_register_subchannel(struct subchannel *sch)
         sch->dev.bus = &css_bus_type;
         sch->dev.release = &css_subchannel_release;
         sch->dev.groups = subch_attr_groups;
+        /*
+         * We don't want to generate uevents for I/O subchannels that don't
+         * have a working ccw device behind them since they will be
+         * unregistered before they can be used anyway, so we delay the add
+         * uevent until after device recognition was successful.
+         */
+        if (!cio_is_console(sch->schid))
+                /* Console is special, no need to suppress. */
+                sch->dev.uevent_suppress = 1;
         css_update_ssd_info(sch);
         /* make it known to the system */
         ret = css_sch_device_register(sch);