s390/dasd: remove unused code

Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 329db997ee6680fc931897b04a01495209df66d2..3679aeca1c1a02b4eed28a84ad9b7bab216c9f1f 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2326,21 +2326,11 @@ retry:
                        return -EAGAIN;
 
                /* normal recovery for basedev IO */
-               if (__dasd_sleep_on_erp(cqr)) {
+               if (__dasd_sleep_on_erp(cqr))
+                       /* handle erp first */
                        goto retry;
-                       /* remember that ERP was needed */
-                       rc = 1;
-                       /* skip processing for active cqr */
-                       if (cqr->status != DASD_CQR_TERMINATED &&
-                           cqr->status != DASD_CQR_NEED_ERP)
-                               break;
-               }
        }
 
-       /* start ERP requests in upper loop */
-       if (rc)
-               goto retry;
-
        return 0;
 }