Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / drivers / s390 / scsi / zfcp_fsf.c

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 510e9b06c1a1eb12fb5c8eb8ccf9652412af9f0f..0fe8d5d951196425871d958c4003f773f8c4a3e2 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -770,7 +770,8 @@ int zfcp_fsf_status_read(struct zfcp_qdio *qdio)
        if (zfcp_qdio_sbal_get(qdio))
                goto out;
 
-       req = zfcp_fsf_req_create(qdio, FSF_QTCB_UNSOLICITED_STATUS, 0,
+       req = zfcp_fsf_req_create(qdio, FSF_QTCB_UNSOLICITED_STATUS,
+                                 SBAL_SFLAGS0_TYPE_STATUS,
                                  adapter->pool.status_read_req);
        if (IS_ERR(req)) {
                retval = PTR_ERR(req);
@@ -2387,12 +2388,3 @@ void zfcp_fsf_reqid_check(struct zfcp_qdio *qdio, int sbal_idx)
                        break;
        }
 }
-
-struct zfcp_fsf_req *zfcp_fsf_get_req(struct zfcp_qdio *qdio,
-                                     struct qdio_buffer *sbal)
-{
-       struct qdio_buffer_element *sbale = &sbal->element[0];
-       u64 req_id = (unsigned long) sbale->addr;
-
-       return zfcp_reqlist_find(qdio->adapter->req_list, req_id);
-}