Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d62f7abc authored by Jan Höppner's avatar Jan Höppner Committed by Martin Schwidefsky
Browse files

s390/dasd: Remove dead return code checks 



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: default avatarJan Höppner <hoeppner@linux.vnet.ibm.com>
Acked-by: default avatarStefan Haberland <sth@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c7848e14

drivers/s390/block/dasd.c

+0 −12
Original line number Diff line number Diff line
@@ -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