1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/s390/crypto/zcrypt_error.h b/drivers/s390/crypto/zcrypt_error.h
index 7b23f43c7b08..de1b6c1d172c 100644
--- a/drivers/s390/crypto/zcrypt_error.h
+++ b/drivers/s390/crypto/zcrypt_error.h
@@ -112,9 +112,10 @@ static inline int convert_error(struct zcrypt_device *zdev,
                 atomic_set(&zcrypt_rescan_req, 1);
                 zdev->online = 0;
                 pr_err("Cryptographic device %x failed and was set offline\n",
-                       zdev->ap_dev->qid);
+                       AP_QID_DEVICE(zdev->ap_dev->qid));
                 ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%drc%d",
-                        zdev->ap_dev->qid, zdev->online, ehdr->reply_code);
+                        AP_QID_DEVICE(zdev->ap_dev->qid), zdev->online,
+                        ehdr->reply_code);
                 return -EAGAIN;
         case REP82_ERROR_TRANSPORT_FAIL:
         case REP82_ERROR_MACHINE_FAILURE:
@@ -123,16 +124,18 @@ static inline int convert_error(struct zcrypt_device *zdev,
                 atomic_set(&zcrypt_rescan_req, 1);
                 zdev->online = 0;
                 pr_err("Cryptographic device %x failed and was set offline\n",
-                       zdev->ap_dev->qid);
+                       AP_QID_DEVICE(zdev->ap_dev->qid));
                 ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%drc%d",
-                        zdev->ap_dev->qid, zdev->online, ehdr->reply_code);
+                        AP_QID_DEVICE(zdev->ap_dev->qid), zdev->online,
+                        ehdr->reply_code);
                 return -EAGAIN;
         default:
                 zdev->online = 0;
                 pr_err("Cryptographic device %x failed and was set offline\n",
-                       zdev->ap_dev->qid);
+                       AP_QID_DEVICE(zdev->ap_dev->qid));
                 ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%drc%d",
-                        zdev->ap_dev->qid, zdev->online, ehdr->reply_code);
+                        AP_QID_DEVICE(zdev->ap_dev->qid), zdev->online,
+                        ehdr->reply_code);
                 return -EAGAIN; /* repeat the request on a different device. */
         }
 }