3 files changed, 9 insertions, 8 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 1e5062690926..5e8442c88e29 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -285,6 +285,12 @@ static int dasd_state_basic_to_known(struct dasd_device *device)
 {
         int rc;
 
+        if (device->discipline->basic_to_known) {
+                rc = device->discipline->basic_to_known(device);
+                if (rc)
+                        return rc;
+        }
+
         if (device->block) {
                 dasd_profile_exit(&device->block->profile);
                 debugfs_remove(device->block->debugfs_dentry);
@@ -375,11 +381,6 @@ static int dasd_state_ready_to_basic(struct dasd_device *device)
 {
         int rc;
 
-        if (device->discipline->ready_to_basic) {
-                rc = device->discipline->ready_to_basic(device);
-                if (rc)
-                        return rc;
-        }
         device->state = DASD_STATE_BASIC;
         if (device->block) {
                 struct dasd_block *block = device->block;
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 2e8e0755070b..39748fda6e1f 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -2039,7 +2039,7 @@ static int dasd_eckd_online_to_ready(struct dasd_device *device)
         return 0;
 };
 
-static int dasd_eckd_ready_to_basic(struct dasd_device *device)
+static int dasd_eckd_basic_to_known(struct dasd_device *device)
 {
         return dasd_alias_remove_device(device);
 };
@@ -4511,7 +4511,7 @@ static struct dasd_discipline dasd_eckd_discipline = {
         .verify_path = dasd_eckd_verify_path,
         .basic_to_ready = dasd_eckd_basic_to_ready,
         .online_to_ready = dasd_eckd_online_to_ready,
-        .ready_to_basic = dasd_eckd_ready_to_basic,
+        .basic_to_known = dasd_eckd_basic_to_known,
         .fill_geometry = dasd_eckd_fill_geometry,
         .start_IO = dasd_start_IO,
         .term_IO = dasd_term_IO,
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 690001af0d09..7a14582dc8a4 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -304,7 +304,7 @@ struct dasd_discipline {
          */
         int (*basic_to_ready) (struct dasd_device *);
         int (*online_to_ready) (struct dasd_device *);
-        int (*ready_to_basic)  (struct dasd_device *);
+        int (*basic_to_known)(struct dasd_device *);
 
         /* (struct dasd_device *);
          * Device operation functions. build_cp creates a ccw chain for