s390/zcrypt: Explicitly use a card variable in _zcrypt_send_cprb

Use an explicit variable "card" for the card addressing in
function _zcrypt_send_cprb instead of the confusing field
"user_defined" from the ica_xcRB struct. This makes the code
somewhat cleaner and easier to understand.

Reviewed-by: Holger Dengler <dengler@linux.ibm.com>
Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index d1b7c93b017bf95342b81fa67af914f63447d092..d6a455df228d07b2b82cf166df2afd9d54c09bf2 100644 (file)
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -854,7 +854,7 @@ static long _zcrypt_send_cprb(u32 xflags, struct ap_perms *perms,
                              struct ica_xcRB *xcrb)
 {
        bool userspace = xflags & ZCRYPT_XFLAG_USERSPACE;
-       unsigned int domain, func_code = 0;
+       unsigned int card, domain, func_code = 0;
        unsigned int wgt = 0, pref_wgt = 0;
        struct zcrypt_queue *zq, *pref_zq;
        struct zcrypt_card *zc, *pref_zc;
@@ -899,6 +899,7 @@ static long _zcrypt_send_cprb(u32 xflags, struct ap_perms *perms,
 
        pref_zc = NULL;
        pref_zq = NULL;
+       card = xcrb->user_defined;
        spin_lock(&zcrypt_list_lock);
        for_each_zcrypt_card(zc) {
                /* Check for usable CCA card */
@@ -906,8 +907,7 @@ static long _zcrypt_send_cprb(u32 xflags, struct ap_perms *perms,
                    !zc->card->hwinfo.cca)
                        continue;
                /* Check for user selected CCA card */
-               if (xcrb->user_defined != AUTOSELECT &&
-                   xcrb->user_defined != zc->card->id)
+               if (card != AUTOSELECT && card != zc->card->id)
                        continue;
                /* check if request size exceeds card max msg size */
                if (ap_msg.len > zc->card->maxmsgsize)
@@ -951,7 +951,7 @@ static long _zcrypt_send_cprb(u32 xflags, struct ap_perms *perms,
 
        if (!pref_zq) {
                pr_debug("no match for address %02x.%04x => ENODEV\n",
-                        xcrb->user_defined, domain);
+                        card, domain);
                rc = -ENODEV;
                goto out;
        }