s390/zcrypt: replace scnprintf with sysfs_emit

[linux-2.6-microblaze.git] / drivers / s390 / crypto / zcrypt_cex2c.c

diff --git a/drivers/s390/crypto/zcrypt_cex2c.c b/drivers/s390/crypto/zcrypt_cex2c.c
index 4dacf5f..78f8d68 100644 (file)
--- a/drivers/s390/crypto/zcrypt_cex2c.c
+++ b/drivers/s390/crypto/zcrypt_cex2c.c
@@ -75,7 +75,7 @@ static ssize_t cca_serialnr_show(struct device *dev,
        if (ap_domain_index >= 0)
                cca_get_info(ac->id, ap_domain_index, &ci, zc->online);
 
-       return scnprintf(buf, PAGE_SIZE, "%s\n", ci.serial);
+       return sysfs_emit(buf, "%s\n", ci.serial);
 }
 
 static struct device_attribute dev_attr_cca_serialnr =
@@ -110,51 +110,46 @@ static ssize_t cca_mkvps_show(struct device *dev,
                     &ci, zq->online);
 
        if (ci.new_aes_mk_state >= '1' && ci.new_aes_mk_state <= '3')
-               n = scnprintf(buf, PAGE_SIZE, "AES NEW: %s 0x%016llx\n",
-                             new_state[ci.new_aes_mk_state - '1'],
-                             ci.new_aes_mkvp);
+               n = sysfs_emit(buf, "AES NEW: %s 0x%016llx\n",
+                              new_state[ci.new_aes_mk_state - '1'],
+                              ci.new_aes_mkvp);
        else
-               n = scnprintf(buf, PAGE_SIZE, "AES NEW: - -\n");
+               n = sysfs_emit(buf, "AES NEW: - -\n");
 
        if (ci.cur_aes_mk_state >= '1' && ci.cur_aes_mk_state <= '2')
-               n += scnprintf(buf + n, PAGE_SIZE - n,
-                              "AES CUR: %s 0x%016llx\n",
-                              cao_state[ci.cur_aes_mk_state - '1'],
-                              ci.cur_aes_mkvp);
+               n += sysfs_emit_at(buf, n, "AES CUR: %s 0x%016llx\n",
+                                  cao_state[ci.cur_aes_mk_state - '1'],
+                                  ci.cur_aes_mkvp);
        else
-               n += scnprintf(buf + n, PAGE_SIZE - n, "AES CUR: - -\n");
+               n += sysfs_emit_at(buf, n, "AES CUR: - -\n");
 
        if (ci.old_aes_mk_state >= '1' && ci.old_aes_mk_state <= '2')
-               n += scnprintf(buf + n, PAGE_SIZE - n,
-                              "AES OLD: %s 0x%016llx\n",
-                              cao_state[ci.old_aes_mk_state - '1'],
-                              ci.old_aes_mkvp);
+               n += sysfs_emit_at(buf, n, "AES OLD: %s 0x%016llx\n",
+                                  cao_state[ci.old_aes_mk_state - '1'],
+                                  ci.old_aes_mkvp);
        else
-               n += scnprintf(buf + n, PAGE_SIZE - n, "AES OLD: - -\n");
+               n += sysfs_emit_at(buf, n, "AES OLD: - -\n");
 
        if (ci.new_apka_mk_state >= '1' && ci.new_apka_mk_state <= '3')
-               n += scnprintf(buf + n, PAGE_SIZE - n,
-                              "APKA NEW: %s 0x%016llx\n",
-                              new_state[ci.new_apka_mk_state - '1'],
-                              ci.new_apka_mkvp);
+               n += sysfs_emit_at(buf, n, "APKA NEW: %s 0x%016llx\n",
+                                  new_state[ci.new_apka_mk_state - '1'],
+                                  ci.new_apka_mkvp);
        else
-               n += scnprintf(buf + n, PAGE_SIZE - n, "APKA NEW: - -\n");
+               n += sysfs_emit_at(buf, n, "APKA NEW: - -\n");
 
        if (ci.cur_apka_mk_state >= '1' && ci.cur_apka_mk_state <= '2')
-               n += scnprintf(buf + n, PAGE_SIZE - n,
-                              "APKA CUR: %s 0x%016llx\n",
-                              cao_state[ci.cur_apka_mk_state - '1'],
-                              ci.cur_apka_mkvp);
+               n += sysfs_emit_at(buf, n, "APKA CUR: %s 0x%016llx\n",
+                                  cao_state[ci.cur_apka_mk_state - '1'],
+                                  ci.cur_apka_mkvp);
        else
-               n += scnprintf(buf + n, PAGE_SIZE - n, "APKA CUR: - -\n");
+               n += sysfs_emit_at(buf, n, "APKA CUR: - -\n");
 
        if (ci.old_apka_mk_state >= '1' && ci.old_apka_mk_state <= '2')
-               n += scnprintf(buf + n, PAGE_SIZE - n,
-                              "APKA OLD: %s 0x%016llx\n",
-                              cao_state[ci.old_apka_mk_state - '1'],
-                              ci.old_apka_mkvp);
+               n += sysfs_emit_at(buf, n, "APKA OLD: %s 0x%016llx\n",
+                                  cao_state[ci.old_apka_mk_state - '1'],
+                                  ci.old_apka_mkvp);
        else
-               n += scnprintf(buf + n, PAGE_SIZE - n, "APKA OLD: - -\n");
+               n += sysfs_emit_at(buf, n, "APKA OLD: - -\n");
 
        return n;
 }