]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
s390/dasd: Remove dead return code checks
authorJan Höppner <hoeppner@linux.vnet.ibm.com>
Thu, 30 Nov 2017 18:18:21 +0000 (19:18 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 23 Jan 2018 06:36:43 +0000 (07:36 +0100)
In dasd_term_IO() ccw_device_clear() is called and the return code is
checked afterwards. Though, the return codes -EIO and -EBUSY will never
be returned and can therefore be removed from the check.

In dasd_start_IO() the return code of either ccw_device_tm_start() or
ccw_device_start() is checked. However, neither of them returns
-ETIMEDOUT. Remove that check as well.

Signed-off-by: Jan Höppner <hoeppner@linux.vnet.ibm.com>
Acked-by: Stefan Haberland <sth@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/block/dasd.c

index d4e8dff673ccf321c6fefddcd9298eb51e189b3a..a7c15f0085e2999787a391327db0f6398d4c2cf0 100644 (file)
@@ -1393,10 +1393,6 @@ int dasd_term_IO(struct dasd_ccw_req *cqr)
                        DBF_DEV_EVENT(DBF_ERR, device, "%s",
                                      "device gone, retry");
                        break;
-               case -EIO:
-                       DBF_DEV_EVENT(DBF_ERR, device, "%s",
-                                     "I/O error, retry");
-                       break;
                case -EINVAL:
                        /*
                         * device not valid so no I/O could be running
@@ -1412,10 +1408,6 @@ int dasd_term_IO(struct dasd_ccw_req *cqr)
                        /* fake rc to success */
                        rc = 0;
                        break;
-               case -EBUSY:
-                       DBF_DEV_EVENT(DBF_ERR, device, "%s",
-                                     "device busy, retry later");
-                       break;
                default:
                        /* internal error 10 - unknown rc*/
                        snprintf(errorstring, ERRORLENGTH, "10 %d", rc);
@@ -1489,10 +1481,6 @@ int dasd_start_IO(struct dasd_ccw_req *cqr)
                DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                              "start_IO: device busy, retry later");
                break;
-       case -ETIMEDOUT:
-               DBF_DEV_EVENT(DBF_WARNING, device, "%s",
-                             "start_IO: request timeout, retry later");
-               break;
        case -EACCES:
                /* -EACCES indicates that the request used only a subset of the
                 * available paths and all these paths are gone. If the lpm of