[SRU,Bionic,1/5] s390/zcrypt: code beautify

Message ID CA+jPhpd-v66JafbR4RVNDfrPZ9_RJk8UYLoozDRMXfJKHcjCCw@mail.gmail.com
State New
Headers show
Series
  • Fixes for LP1799184 [v2]
Related show

Commit Message

Frank Heimes Nov. 2, 2018, 7:31 p.m.
From: Harald Freudenberger <freude@linux.ibm.com>

BugLink: http://bugs.launchpad.net/bugs/1799184

Code beautify by following most of the checkpatch suggestions:
 - SPDX license identifier line complains by checkpatch
 - missing space or newline complains by checkpatch
 - octal numbers for permssions complains by checkpatch
 - renaming of static sysfs functions complains by checkpatch
 - fix of block comment complains by checkpatch
 - fix printf like calls where function name instead of %s __func__
   was used
 - __packed instead of __attribute__((packed))
 - init to zero for static variables removed
 - use of DEVICE_ATTR_RO and DEVICE_ATTR_RW macros

No functional code changes or API changes!

Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
(cherry-picked from commit ac2b96f351d7d222c46e524feca03005f3fa8d75)
Signed-off-by: Frank Heimes <frank.heimes@canonical.com>

---

        &dev_attr_online.attr,

Patch

diff --git a/arch/s390/include/uapi/asm/zcrypt.h
b/arch/s390/include/uapi/asm/zcrypt.h
index b62e061..2bb1f3b 100644
--- a/arch/s390/include/uapi/asm/zcrypt.h
+++ b/arch/s390/include/uapi/asm/zcrypt.h
@@ -32,12 +32,12 @@ 
  * - length(n_modulus) = inputdatalength
  */
 struct ica_rsa_modexpo {
-       char __user *   inputdata;
-       unsigned int    inputdatalength;
-       char __user *   outputdata;
-       unsigned int    outputdatalength;
-       char __user *   b_key;
-       char __user *   n_modulus;
+       char __user  *inputdata;
+       unsigned int  inputdatalength;
+       char __user  *outputdata;
+       unsigned int  outputdatalength;
+       char __user  *b_key;
+       char __user  *n_modulus;
 };

 /**
@@ -55,15 +55,15 @@  struct ica_rsa_modexpo {
  * - length(u_mult_inv) = inputdatalength/2 + 8
  */
 struct ica_rsa_modexpo_crt {
-       char __user *   inputdata;
-       unsigned int    inputdatalength;
-       char __user *   outputdata;
-       unsigned int    outputdatalength;
-       char __user *   bp_key;
-       char __user *   bq_key;
-       char __user *   np_prime;
-       char __user *   nq_prime;
-       char __user *   u_mult_inv;
+       char __user  *inputdata;
+       unsigned int  inputdatalength;
+       char __user  *outputdata;
+       unsigned int  outputdatalength;
+       char __user  *bp_key;
+       char __user  *bq_key;
+       char __user  *np_prime;
+       char __user  *nq_prime;
+       char __user  *u_mult_inv;
 };

 /**
@@ -93,18 +93,18 @@  struct CPRBX {
        unsigned int    req_extbl;      /* request extension block len   */
        unsigned char   pad_001[4];     /* reserved                      */
        unsigned int    rpld_extbl;     /* replied extension block len   */
-       unsigned char   padx000[16 - sizeof (char *)];
-       unsigned char * req_parmb;      /* request parm block 'address'  */
-       unsigned char   padx001[16 - sizeof (char *)];
-       unsigned char * req_datab;      /* request data block 'address'  */
-       unsigned char   padx002[16 - sizeof (char *)];
-       unsigned char * rpl_parmb;      /* reply parm block 'address'    */
-       unsigned char   padx003[16 - sizeof (char *)];
-       unsigned char * rpl_datab;      /* reply data block 'address'    */
-       unsigned char   padx004[16 - sizeof (char *)];
-       unsigned char * req_extb;       /* request extension block 'addr'*/
-       unsigned char   padx005[16 - sizeof (char *)];
-       unsigned char * rpl_extb;       /* reply extension block 'address'*/
+       unsigned char   padx000[16 - sizeof(char *)];
+       unsigned char  *req_parmb;      /* request parm block 'address'  */
+       unsigned char   padx001[16 - sizeof(char *)];
+       unsigned char  *req_datab;      /* request data block 'address'  */
+       unsigned char   padx002[16 - sizeof(char *)];
+       unsigned char  *rpl_parmb;      /* reply parm block 'address'    */
+       unsigned char   padx003[16 - sizeof(char *)];
+       unsigned char  *rpl_datab;      /* reply data block 'address'    */
+       unsigned char   padx004[16 - sizeof(char *)];
+       unsigned char  *req_extb;       /* request extension block 'addr'*/
+       unsigned char   padx005[16 - sizeof(char *)];
+       unsigned char  *rpl_extb;       /* reply extension block 'address'*/
        unsigned short  ccp_rtcode;     /* server return code            */
        unsigned short  ccp_rscode;     /* server reason code            */
        unsigned int    mac_data_len;   /* Mac Data Length               */
@@ -127,17 +127,17 @@  struct ica_xcRB {
        unsigned int    user_defined;
        unsigned short  request_ID;
        unsigned int    request_control_blk_length;
-       unsigned char   padding1[16 - sizeof (char *)];
-       char __user *   request_control_blk_addr;
+       unsigned char   padding1[16 - sizeof(char *)];
+       char __user    *request_control_blk_addr;
        unsigned int    request_data_length;
-       char            padding2[16 - sizeof (char *)];
-       char __user *   request_data_address;
+       char            padding2[16 - sizeof(char *)];
+       char __user    *request_data_address;
        unsigned int    reply_control_blk_length;
-       char            padding3[16 - sizeof (char *)];
-       char __user *   reply_control_blk_addr;
+       char            padding3[16 - sizeof(char *)];
+       char __user    *reply_control_blk_addr;
        unsigned int    reply_data_length;
-       char            padding4[16 - sizeof (char *)];
-       char __user *   reply_data_addr;
+       char            padding4[16 - sizeof(char *)];
+       char __user    *reply_data_addr;
        unsigned short  priority_window;
        unsigned int    status;
 } __attribute__((packed));
@@ -233,7 +233,7 @@  struct zcrypt_device_matrix_ext {
        struct zcrypt_device_status_ext device[MAX_ZDEV_ENTRIES_EXT];
 };

-#define AUTOSELECT ((unsigned int)0xFFFFFFFF)
+#define AUTOSELECT 0xFFFFFFFF

 #define ZCRYPT_IOCTL_MAGIC 'z'

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 7b9a493..bf720ae 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -43,12 +43,12 @@ 
  */
 int ap_domain_index = -1;      /* Adjunct Processor Domain Index */
 static DEFINE_SPINLOCK(ap_domain_lock);
-module_param_named(domain, ap_domain_index, int, S_IRUSR|S_IRGRP);
+module_param_named(domain, ap_domain_index, int, 0440);
 MODULE_PARM_DESC(domain, "domain index for ap devices");
 EXPORT_SYMBOL(ap_domain_index);

-static int ap_thread_flag = 0;
-module_param_named(poll_thread, ap_thread_flag, int, S_IRUSR|S_IRGRP);
+static int ap_thread_flag;
+module_param_named(poll_thread, ap_thread_flag, int, 0440);
 MODULE_PARM_DESC(poll_thread, "Turn on/off poll thread, default is 0
(off).");

 static struct device *ap_root_device;
@@ -78,22 +78,26 @@  static DECLARE_WORK(ap_scan_work, ap_scan_bus);
 static void ap_tasklet_fn(unsigned long);
 static DECLARE_TASKLET(ap_tasklet, ap_tasklet_fn, 0);
 static DECLARE_WAIT_QUEUE_HEAD(ap_poll_wait);
-static struct task_struct *ap_poll_kthread = NULL;
+static struct task_struct *ap_poll_kthread;
 static DEFINE_MUTEX(ap_poll_thread_mutex);
 static DEFINE_SPINLOCK(ap_poll_timer_lock);
 static struct hrtimer ap_poll_timer;
-/* In LPAR poll with 4kHz frequency. Poll every 250000 nanoseconds.
- * If z/VM change to 1500000 nanoseconds to adjust to z/VM polling.*/
+/*
+ * In LPAR poll with 4kHz frequency. Poll every 250000 nanoseconds.
+ * If z/VM change to 1500000 nanoseconds to adjust to z/VM polling.
+ */
 static unsigned long long poll_timeout = 250000;

 /* Suspend flag */
 static int ap_suspend_flag;
 /* Maximum domain id */
 static int ap_max_domain_id;
-/* Flag to check if domain was set through module parameter domain=. This
is
+/*
+ * Flag to check if domain was set through module parameter domain=. This
is
  * important when supsend and resume is done in a z/VM environment where
the
- * domain might change. */
-static int user_set_domain = 0;
+ * domain might change.
+ */
+static int user_set_domain;
 static struct bus_type ap_bus_type;

 /* Adapter interrupt definitions */
@@ -531,7 +535,7 @@  static int ap_bus_match(struct device *dev, struct
device_driver *drv)
  * It sets up a single environment variable DEV_TYPE which contains the
  * hardware device type.
  */
-static int ap_uevent (struct device *dev, struct kobj_uevent_env *env)
+static int ap_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
        struct ap_device *ap_dev = to_ap_dev(dev);
        int retval = 0;
@@ -570,7 +574,7 @@  static int ap_dev_resume(struct device *dev)

 static void ap_bus_suspend(void)
 {
-       AP_DBF(DBF_DEBUG, "ap_bus_suspend running\n");
+       AP_DBF(DBF_DEBUG, "%s running\n", __func__);

        ap_suspend_flag = 1;
        /*
@@ -607,7 +611,7 @@  static void ap_bus_resume(void)
 {
        int rc;

-       AP_DBF(DBF_DEBUG, "ap_bus_resume running\n");
+       AP_DBF(DBF_DEBUG, "%s running\n", __func__);

        /* remove all queue devices */
        bus_for_each_dev(&ap_bus_type, NULL, NULL,
@@ -775,7 +779,7 @@  static ssize_t ap_domain_store(struct bus_type *bus,
        return count;
 }

-static BUS_ATTR(ap_domain, 0644, ap_domain_show, ap_domain_store);
+static BUS_ATTR_RW(ap_domain);

 static ssize_t ap_control_domain_mask_show(struct bus_type *bus, char *buf)
 {
@@ -790,8 +794,7 @@  static ssize_t ap_control_domain_mask_show(struct
bus_type *bus, char *buf)
                        ap_configuration->adm[6], ap_configuration->adm[7]);
 }

-static BUS_ATTR(ap_control_domain_mask, 0444,
-               ap_control_domain_mask_show, NULL);
+static BUS_ATTR_RO(ap_control_domain_mask);

 static ssize_t ap_usage_domain_mask_show(struct bus_type *bus, char *buf)
 {
@@ -806,13 +809,7 @@  static ssize_t ap_usage_domain_mask_show(struct
bus_type *bus, char *buf)
                        ap_configuration->aqm[6], ap_configuration->aqm[7]);
 }

-static BUS_ATTR(ap_usage_domain_mask, 0444,
-               ap_usage_domain_mask_show, NULL);
-
-static ssize_t ap_config_time_show(struct bus_type *bus, char *buf)
-{
-       return snprintf(buf, PAGE_SIZE, "%d\n", ap_config_time);
-}
+static BUS_ATTR_RO(ap_usage_domain_mask);

 static ssize_t ap_interrupts_show(struct bus_type *bus, char *buf)
 {
@@ -820,10 +817,15 @@  static ssize_t ap_interrupts_show(struct bus_type
*bus, char *buf)
                        ap_using_interrupts() ? 1 : 0);
 }

-static BUS_ATTR(ap_interrupts, 0444, ap_interrupts_show, NULL);
+static BUS_ATTR_RO(ap_interrupts);
+
+static ssize_t config_time_show(struct bus_type *bus, char *buf)
+{
+       return snprintf(buf, PAGE_SIZE, "%d\n", ap_config_time);
+}

-static ssize_t ap_config_time_store(struct bus_type *bus,
-                                   const char *buf, size_t count)
+static ssize_t config_time_store(struct bus_type *bus,
+                                const char *buf, size_t count)
 {
        int time;

@@ -834,15 +836,15 @@  static ssize_t ap_config_time_store(struct bus_type
*bus,
        return count;
 }

-static BUS_ATTR(config_time, 0644, ap_config_time_show,
ap_config_time_store);
+static BUS_ATTR_RW(config_time);

-static ssize_t ap_poll_thread_show(struct bus_type *bus, char *buf)
+static ssize_t poll_thread_show(struct bus_type *bus, char *buf)
 {
        return snprintf(buf, PAGE_SIZE, "%d\n", ap_poll_kthread ? 1 : 0);
 }

-static ssize_t ap_poll_thread_store(struct bus_type *bus,
-                                   const char *buf, size_t count)
+static ssize_t poll_thread_store(struct bus_type *bus,
+                                const char *buf, size_t count)
 {
        int flag, rc;

@@ -857,7 +859,7 @@  static ssize_t ap_poll_thread_store(struct bus_type
*bus,
        return count;
 }

-static BUS_ATTR(poll_thread, 0644, ap_poll_thread_show,
ap_poll_thread_store);
+static BUS_ATTR_RW(poll_thread);

 static ssize_t poll_timeout_show(struct bus_type *bus, char *buf)
 {
@@ -886,7 +888,7 @@  static ssize_t poll_timeout_store(struct bus_type *bus,
const char *buf,
        return count;
 }

-static BUS_ATTR(poll_timeout, 0644, poll_timeout_show, poll_timeout_store);
+static BUS_ATTR_RW(poll_timeout);

 static ssize_t ap_max_domain_id_show(struct bus_type *bus, char *buf)
 {
@@ -899,7 +901,7 @@  static ssize_t ap_max_domain_id_show(struct bus_type
*bus, char *buf)
        return snprintf(buf, PAGE_SIZE, "%d\n", max_domain_id);
 }

-static BUS_ATTR(ap_max_domain_id, 0444, ap_max_domain_id_show, NULL);
+static BUS_ATTR_RO(ap_max_domain_id);

 static struct bus_attribute *const ap_bus_attrs[] = {
        &bus_attr_ap_domain,
@@ -956,7 +958,7 @@  static int ap_select_domain(void)
                        best_domain = i;
                }
        }
-       if (best_domain >= 0){
+       if (best_domain >= 0) {
                ap_domain_index = best_domain;
                AP_DBF(DBF_DEBUG, "new ap_domain_index=%d\n",
ap_domain_index);
                spin_unlock_bh(&ap_domain_lock);
@@ -1038,7 +1040,7 @@  static void ap_scan_bus(struct work_struct *unused)
        unsigned int func = 0;
        int rc, id, dom, borked, domains, defdomdevs = 0;

-       AP_DBF(DBF_DEBUG, "ap_scan_bus running\n");
+       AP_DBF(DBF_DEBUG, "%s running\n", __func__);

        ap_query_configuration(ap_configuration);
        if (ap_select_domain() != 0)
@@ -1163,7 +1165,8 @@  static void ap_scan_bus(struct work_struct *unused)
        } /* end device loop */

        if (defdomdevs < 1)
-               AP_DBF(DBF_INFO, "no queue device with default domain %d
available\n",
+               AP_DBF(DBF_INFO,
+                      "no queue device with default domain %d available\n",
                       ap_domain_index);

 out:
diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index 9365419..24d3425 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright IBM Corp. 2006, 2012
  * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -167,7 +167,7 @@  struct ap_queue {
        int pendingq_count;             /* # requests on pendingq list. */
        int requestq_count;             /* # requests on requestq list. */
        int total_request_count;        /* # requests ever for this AP
device.*/
-       int request_timeout;            /* Request timout in jiffies. */
+       int request_timeout;            /* Request timeout in jiffies. */
        struct timer_list timeout;      /* Timer for request timeouts. */
        struct list_head pendingq;      /* List of message sent to AP
queue. */
        struct list_head requestq;      /* List of message yet to be sent.
*/
diff --git a/drivers/s390/crypto/ap_card.c b/drivers/s390/crypto/ap_card.c
index c13e432..63b4cc6 100644
--- a/drivers/s390/crypto/ap_card.c
+++ b/drivers/s390/crypto/ap_card.c
@@ -18,35 +18,35 @@ 
 /*
  * AP card related attributes.
  */
-static ssize_t ap_hwtype_show(struct device *dev,
-                             struct device_attribute *attr, char *buf)
+static ssize_t hwtype_show(struct device *dev,
+                          struct device_attribute *attr, char *buf)
 {
        struct ap_card *ac = to_ap_card(dev);

        return snprintf(buf, PAGE_SIZE, "%d\n", ac->ap_dev.device_type);
 }

-static DEVICE_ATTR(hwtype, 0444, ap_hwtype_show, NULL);
+static DEVICE_ATTR_RO(hwtype);

-static ssize_t ap_raw_hwtype_show(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
+static ssize_t raw_hwtype_show(struct device *dev,
+                              struct device_attribute *attr, char *buf)
 {
        struct ap_card *ac = to_ap_card(dev);

        return snprintf(buf, PAGE_SIZE, "%d\n", ac->raw_hwtype);
 }

-static DEVICE_ATTR(raw_hwtype, 0444, ap_raw_hwtype_show, NULL);
+static DEVICE_ATTR_RO(raw_hwtype);

-static ssize_t ap_depth_show(struct device *dev, struct device_attribute
*attr,
-                            char *buf)
+static ssize_t depth_show(struct device *dev, struct device_attribute
*attr,
+                         char *buf)
 {
        struct ap_card *ac = to_ap_card(dev);

        return snprintf(buf, PAGE_SIZE, "%d\n", ac->queue_depth);
 }

-static DEVICE_ATTR(depth, 0444, ap_depth_show, NULL);
+static DEVICE_ATTR_RO(depth);

 static ssize_t ap_functions_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
@@ -58,9 +58,9 @@  static ssize_t ap_functions_show(struct device *dev,

 static DEVICE_ATTR_RO(ap_functions);

-static ssize_t ap_req_count_show(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf)
+static ssize_t request_count_show(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
 {
        struct ap_card *ac = to_ap_card(dev);
        unsigned int req_cnt;
@@ -72,9 +72,9 @@  static ssize_t ap_req_count_show(struct device *dev,
        return snprintf(buf, PAGE_SIZE, "%d\n", req_cnt);
 }

-static ssize_t ap_req_count_store(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t count)
+static ssize_t request_count_store(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
 {
        struct ap_card *ac = to_ap_card(dev);
        struct ap_queue *aq;
@@ -88,10 +88,10 @@  static ssize_t ap_req_count_store(struct device *dev,
        return count;
 }

-static DEVICE_ATTR(request_count, 0644, ap_req_count_show,
ap_req_count_store);
+static DEVICE_ATTR_RW(request_count);

-static ssize_t ap_requestq_count_show(struct device *dev,
-                                     struct device_attribute *attr, char
*buf)
+static ssize_t requestq_count_show(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
 {
        struct ap_card *ac = to_ap_card(dev);
        struct ap_queue *aq;
@@ -105,10 +105,10 @@  static ssize_t ap_requestq_count_show(struct device
*dev,
        return snprintf(buf, PAGE_SIZE, "%d\n", reqq_cnt);
 }

-static DEVICE_ATTR(requestq_count, 0444, ap_requestq_count_show, NULL);
+static DEVICE_ATTR_RO(requestq_count);

-static ssize_t ap_pendingq_count_show(struct device *dev,
-                                     struct device_attribute *attr, char
*buf)
+static ssize_t pendingq_count_show(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
 {
        struct ap_card *ac = to_ap_card(dev);
        struct ap_queue *aq;
@@ -122,15 +122,15 @@  static ssize_t ap_pendingq_count_show(struct device
*dev,
        return snprintf(buf, PAGE_SIZE, "%d\n", penq_cnt);
 }

-static DEVICE_ATTR(pendingq_count, 0444, ap_pendingq_count_show, NULL);
+static DEVICE_ATTR_RO(pendingq_count);

-static ssize_t ap_modalias_show(struct device *dev,
-                               struct device_attribute *attr, char *buf)
+static ssize_t modalias_show(struct device *dev,
+                            struct device_attribute *attr, char *buf)
 {
        return sprintf(buf, "ap:t%02X\n", to_ap_dev(dev)->device_type);
 }

-static DEVICE_ATTR(modalias, 0444, ap_modalias_show, NULL);
+static DEVICE_ATTR_RO(modalias);

 static struct attribute *ap_card_dev_attrs[] = {
        &dev_attr_hwtype.attr,
diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c
index e365171..66f7334 100644
--- a/drivers/s390/crypto/ap_queue.c
+++ b/drivers/s390/crypto/ap_queue.c
@@ -462,9 +462,9 @@  EXPORT_SYMBOL(ap_queue_resume);
 /*
  * AP queue related attributes.
  */
-static ssize_t ap_req_count_show(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf)
+static ssize_t request_count_show(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
 {
        struct ap_queue *aq = to_ap_queue(dev);
        unsigned int req_cnt;
@@ -475,9 +475,9 @@  static ssize_t ap_req_count_show(struct device *dev,
        return snprintf(buf, PAGE_SIZE, "%d\n", req_cnt);
 }

-static ssize_t ap_req_count_store(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t count)
+static ssize_t request_count_store(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
 {
        struct ap_queue *aq = to_ap_queue(dev);

@@ -488,10 +488,10 @@  static ssize_t ap_req_count_store(struct device *dev,
        return count;
 }

-static DEVICE_ATTR(request_count, 0644, ap_req_count_show,
ap_req_count_store);
+static DEVICE_ATTR_RW(request_count);

-static ssize_t ap_requestq_count_show(struct device *dev,
-                                     struct device_attribute *attr, char
*buf)
+static ssize_t requestq_count_show(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
 {
        struct ap_queue *aq = to_ap_queue(dev);
        unsigned int reqq_cnt = 0;
@@ -502,10 +502,10 @@  static ssize_t ap_requestq_count_show(struct device
*dev,
        return snprintf(buf, PAGE_SIZE, "%d\n", reqq_cnt);
 }

-static DEVICE_ATTR(requestq_count, 0444, ap_requestq_count_show, NULL);
+static DEVICE_ATTR_RO(requestq_count);

-static ssize_t ap_pendingq_count_show(struct device *dev,
-                                     struct device_attribute *attr, char
*buf)
+static ssize_t pendingq_count_show(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
 {
        struct ap_queue *aq = to_ap_queue(dev);
        unsigned int penq_cnt = 0;
@@ -516,10 +516,10 @@  static ssize_t ap_pendingq_count_show(struct device
*dev,
        return snprintf(buf, PAGE_SIZE, "%d\n", penq_cnt);
 }

-static DEVICE_ATTR(pendingq_count, 0444, ap_pendingq_count_show, NULL);
+static DEVICE_ATTR_RO(pendingq_count);

-static ssize_t ap_reset_show(struct device *dev,
-                                     struct device_attribute *attr, char
*buf)
+static ssize_t reset_show(struct device *dev,
+                         struct device_attribute *attr, char *buf)
 {
        struct ap_queue *aq = to_ap_queue(dev);
        int rc = 0;
@@ -541,10 +541,10 @@  static ssize_t ap_reset_show(struct device *dev,
        return rc;
 }

-static DEVICE_ATTR(reset, 0444, ap_reset_show, NULL);
+static DEVICE_ATTR_RO(reset);

-static ssize_t ap_interrupt_show(struct device *dev,
-                                struct device_attribute *attr, char *buf)
+static ssize_t interrupt_show(struct device *dev,
+                             struct device_attribute *attr, char *buf)
 {
        struct ap_queue *aq = to_ap_queue(dev);
        int rc = 0;
@@ -560,7 +560,7 @@  static ssize_t ap_interrupt_show(struct device *dev,
        return rc;
 }

-static DEVICE_ATTR(interrupt, 0444, ap_interrupt_show, NULL);
+static DEVICE_ATTR_RO(interrupt);

 static struct attribute *ap_queue_dev_attrs[] = {
        &dev_attr_request_count.attr,
diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c
index e663432..1b4001e 100644
--- a/drivers/s390/crypto/pkey_api.c
+++ b/drivers/s390/crypto/pkey_api.c
@@ -82,20 +82,20 @@  static int check_secaeskeytoken(const u8 *token, int
keybitsize)

        if (t->type != 0x01) {
                DEBUG_ERR(
-                       "check_secaeskeytoken secure token check failed,
type mismatch 0x%02x != 0x01\n",
-                       (int) t->type);
+                       "%s secure token check failed, type mismatch 0x%02x
!= 0x01\n",
+                       __func__, (int) t->type);
                return -EINVAL;
        }
        if (t->version != 0x04) {
                DEBUG_ERR(
-                       "check_secaeskeytoken secure token check failed,
version mismatch 0x%02x != 0x04\n",
-                       (int) t->version);
+                       "%s secure token check failed, version mismatch
0x%02x != 0x04\n",
+                       __func__, (int) t->version);
                return -EINVAL;
        }
        if (keybitsize > 0 && t->bitsize != keybitsize) {
                DEBUG_ERR(
-                       "check_secaeskeytoken secure token check failed,
bitsize mismatch %d != %d\n",
-                       (int) t->bitsize, keybitsize);
+                       "%s secure token check failed, bitsize mismatch %d
!= %d\n",
+                       __func__, (int) t->bitsize, keybitsize);
                return -EINVAL;
        }

@@ -270,8 +270,8 @@  int pkey_genseckey(u16 cardnr, u16 domain,
                break;
        default:
                DEBUG_ERR(
-                       "pkey_genseckey unknown/unsupported keytype %d\n",
-                       keytype);
+                       "%s unknown/unsupported keytype %d\n",
+                       __func__, keytype);
                rc = -EINVAL;
                goto out;
        }
@@ -290,15 +290,16 @@  int pkey_genseckey(u16 cardnr, u16 domain,
        rc = _zcrypt_send_cprb(&xcrb);
        if (rc) {
                DEBUG_ERR(
-                       "pkey_genseckey zcrypt_send_cprb (cardnr=%d
domain=%d) failed with errno %d\n",
-                       (int) cardnr, (int) domain, rc);
+                       "%s zcrypt_send_cprb (cardnr=%d domain=%d) failed
with errno %d\n",
+                       __func__, (int) cardnr, (int) domain, rc);
                goto out;
        }

        /* check response returncode and reasoncode */
        if (prepcblk->ccp_rtcode != 0) {
                DEBUG_ERR(
-                       "pkey_genseckey secure key generate failure, card
response %d/%d\n",
+                       "%s secure key generate failure, card response
%d/%d\n",
+                       __func__,
                        (int) prepcblk->ccp_rtcode,
                        (int) prepcblk->ccp_rscode);
                rc = -EIO;
@@ -315,8 +316,8 @@  int pkey_genseckey(u16 cardnr, u16 domain,
                - sizeof(prepparm->lv3.keyblock.tokattr);
        if (seckeysize != SECKEYBLOBSIZE) {
                DEBUG_ERR(
-                       "pkey_genseckey secure token size mismatch %d != %d
bytes\n",
-                       seckeysize, SECKEYBLOBSIZE);
+                       "%s secure token size mismatch %d != %d bytes\n",
+                       __func__, seckeysize, SECKEYBLOBSIZE);
                rc = -EIO;
                goto out;
        }
@@ -407,8 +408,8 @@  int pkey_clr2seckey(u16 cardnr, u16 domain, u32 keytype,
                break;
        default:
                DEBUG_ERR(
-                       "pkey_clr2seckey unknown/unsupported keytype %d\n",
-                       keytype);
+                       "%s unknown/unsupported keytype %d\n",
+                       __func__, keytype);
                rc = -EINVAL;
                goto out;
        }
@@ -427,15 +428,16 @@  int pkey_clr2seckey(u16 cardnr, u16 domain, u32
keytype,
        rc = _zcrypt_send_cprb(&xcrb);
        if (rc) {
                DEBUG_ERR(
-                       "pkey_clr2seckey zcrypt_send_cprb (cardnr=%d
domain=%d) failed with errno %d\n",
-                       (int) cardnr, (int) domain, rc);
+                       "%s zcrypt_send_cprb (cardnr=%d domain=%d) failed
with errno %d\n",
+                       __func__, (int) cardnr, (int) domain, rc);
                goto out;
        }

        /* check response returncode and reasoncode */
        if (prepcblk->ccp_rtcode != 0) {
                DEBUG_ERR(
-                       "pkey_clr2seckey clear key import failure, card
response %d/%d\n",
+                       "%s clear key import failure, card response
%d/%d\n",
+                       __func__,
                        (int) prepcblk->ccp_rtcode,
                        (int) prepcblk->ccp_rscode);
                rc = -EIO;
@@ -452,8 +454,8 @@  int pkey_clr2seckey(u16 cardnr, u16 domain, u32 keytype,
                - sizeof(prepparm->lv3.keyblock.tokattr);
        if (seckeysize != SECKEYBLOBSIZE) {
                DEBUG_ERR(
-                       "pkey_clr2seckey secure token size mismatch %d !=
%d bytes\n",
-                       seckeysize, SECKEYBLOBSIZE);
+                       "%s secure token size mismatch %d != %d bytes\n",
+                       __func__, seckeysize, SECKEYBLOBSIZE);
                rc = -EIO;
                goto out;
        }
@@ -553,15 +555,16 @@  int pkey_sec2protkey(u16 cardnr, u16 domain,
        rc = _zcrypt_send_cprb(&xcrb);
        if (rc) {
                DEBUG_ERR(
-                       "pkey_sec2protkey zcrypt_send_cprb (cardnr=%d
domain=%d) failed with errno %d\n",
-                       (int) cardnr, (int) domain, rc);
+                       "%s zcrypt_send_cprb (cardnr=%d domain=%d) failed
with errno %d\n",
+                       __func__, (int) cardnr, (int) domain, rc);
                goto out;
        }

        /* check response returncode and reasoncode */
        if (prepcblk->ccp_rtcode != 0) {
                DEBUG_ERR(
-                       "pkey_sec2protkey unwrap secure key failure, card
response %d/%d\n",
+                       "%s unwrap secure key failure, card response
%d/%d\n",
+                       __func__,
                        (int) prepcblk->ccp_rtcode,
                        (int) prepcblk->ccp_rscode);
                rc = -EIO;
@@ -569,7 +572,8 @@  int pkey_sec2protkey(u16 cardnr, u16 domain,
        }
        if (prepcblk->ccp_rscode != 0) {
                DEBUG_WARN(
-                       "pkey_sec2protkey unwrap secure key warning, card
response %d/%d\n",
+                       "%s unwrap secure key warning, card response
%d/%d\n",
+                       __func__,
                        (int) prepcblk->ccp_rtcode,
                        (int) prepcblk->ccp_rscode);
        }
@@ -581,8 +585,8 @@  int pkey_sec2protkey(u16 cardnr, u16 domain,
        /* check the returned keyblock */
        if (prepparm->lv3.keyblock.version != 0x01) {
                DEBUG_ERR(
-                       "pkey_sec2protkey reply param keyblock version
mismatch 0x%02x != 0x01\n",
-                       (int) prepparm->lv3.keyblock.version);
+                       "%s reply param keyblock version mismatch 0x%02x !=
0x01\n",
+                       __func__, (int) prepparm->lv3.keyblock.version);
                rc = -EIO;
                goto out;
        }
@@ -599,8 +603,8 @@  int pkey_sec2protkey(u16 cardnr, u16 domain,
                protkey->type = PKEY_KEYTYPE_AES_256;
                break;
        default:
-               DEBUG_ERR("pkey_sec2protkey unknown/unsupported keytype
%d\n",
-                         prepparm->lv3.keyblock.keylen);
+               DEBUG_ERR("%s unknown/unsupported keytype %d\n",
+                         __func__, prepparm->lv3.keyblock.keylen);
                rc = -EIO;
                goto out;
        }
@@ -638,8 +642,8 @@  int pkey_clr2protkey(u32 keytype,
                fc = CPACF_PCKMO_ENC_AES_256_KEY;
                break;
        default:
-               DEBUG_ERR("pkey_clr2protkey unknown/unsupported keytype
%d\n",
-                         keytype);
+               DEBUG_ERR("%s unknown/unsupported keytype %d\n",
+                         __func__, keytype);
                return -EINVAL;
        }

@@ -713,15 +717,16 @@  static int query_crypto_facility(u16 cardnr, u16
domain,
        rc = _zcrypt_send_cprb(&xcrb);
        if (rc) {
                DEBUG_ERR(
-                       "query_crypto_facility zcrypt_send_cprb (cardnr=%d
domain=%d) failed with errno %d\n",
-                       (int) cardnr, (int) domain, rc);
+                       "%s zcrypt_send_cprb (cardnr=%d domain=%d) failed
with errno %d\n",
+                       __func__, (int) cardnr, (int) domain, rc);
                goto out;
        }

        /* check response returncode and reasoncode */
        if (prepcblk->ccp_rtcode != 0) {
                DEBUG_ERR(
-                       "query_crypto_facility unwrap secure key failure,
card response %d/%d\n",
+                       "%s unwrap secure key failure, card response
%d/%d\n",
+                       __func__,
                        (int) prepcblk->ccp_rtcode,
                        (int) prepcblk->ccp_rscode);
                rc = -EIO;
@@ -993,7 +998,7 @@  int pkey_skey2pkey(const struct pkey_seckey *seckey,
        }

        if (rc)
-               DEBUG_DBG("pkey_skey2pkey failed rc=%d\n", rc);
+               DEBUG_DBG("%s failed rc=%d\n", __func__, rc);

        return rc;
 }
@@ -1030,7 +1035,7 @@  int pkey_verifykey(const struct pkey_seckey *seckey,
        if (rc)
                goto out;
        if (t->mkvp == mkvp[1]) {
-               DEBUG_DBG("pkey_verifykey secure key has old mkvp\n");
+               DEBUG_DBG("%s secure key has old mkvp\n", __func__);
                if (pattributes)
                        *pattributes |= PKEY_VERIFY_ATTR_OLD_MKVP;
        }
@@ -1041,7 +1046,7 @@  int pkey_verifykey(const struct pkey_seckey *seckey,
                *pdomain = domain;

 out:
-       DEBUG_DBG("pkey_verifykey rc=%d\n", rc);
+       DEBUG_DBG("%s rc=%d\n", __func__, rc);
        return rc;
 }
 EXPORT_SYMBOL(pkey_verifykey);
@@ -1064,7 +1069,7 @@  static long pkey_unlocked_ioctl(struct file *filp,
unsigned int cmd,
                        return -EFAULT;
                rc = pkey_genseckey(kgs.cardnr, kgs.domain,
                                    kgs.keytype, &kgs.seckey);
-               DEBUG_DBG("pkey_ioctl pkey_genseckey()=%d\n", rc);
+               DEBUG_DBG("%s pkey_genseckey()=%d\n", __func__, rc);
                if (rc)
                        break;
                if (copy_to_user(ugs, &kgs, sizeof(kgs)))
@@ -1079,7 +1084,7 @@  static long pkey_unlocked_ioctl(struct file *filp,
unsigned int cmd,
                        return -EFAULT;
                rc = pkey_clr2seckey(kcs.cardnr, kcs.domain, kcs.keytype,
                                     &kcs.clrkey, &kcs.seckey);
-               DEBUG_DBG("pkey_ioctl pkey_clr2seckey()=%d\n", rc);
+               DEBUG_DBG("%s pkey_clr2seckey()=%d\n", __func__, rc);
                if (rc)
                        break;
                if (copy_to_user(ucs, &kcs, sizeof(kcs)))
@@ -1095,7 +1100,7 @@  static long pkey_unlocked_ioctl(struct file *filp,
unsigned int cmd,
                        return -EFAULT;
                rc = pkey_sec2protkey(ksp.cardnr, ksp.domain,
                                      &ksp.seckey, &ksp.protkey);
-               DEBUG_DBG("pkey_ioctl pkey_sec2protkey()=%d\n", rc);
+               DEBUG_DBG("%s pkey_sec2protkey()=%d\n", __func__, rc);
                if (rc)
                        break;
                if (copy_to_user(usp, &ksp, sizeof(ksp)))
@@ -1110,7 +1115,7 @@  static long pkey_unlocked_ioctl(struct file *filp,
unsigned int cmd,
                        return -EFAULT;
                rc = pkey_clr2protkey(kcp.keytype,
                                      &kcp.clrkey, &kcp.protkey);
-               DEBUG_DBG("pkey_ioctl pkey_clr2protkey()=%d\n", rc);
+               DEBUG_DBG("%s pkey_clr2protkey()=%d\n", __func__, rc);
                if (rc)
                        break;
                if (copy_to_user(ucp, &kcp, sizeof(kcp)))
@@ -1126,7 +1131,7 @@  static long pkey_unlocked_ioctl(struct file *filp,
unsigned int cmd,
                        return -EFAULT;
                rc = pkey_findcard(&kfc.seckey,
                                   &kfc.cardnr, &kfc.domain, 1);
-               DEBUG_DBG("pkey_ioctl pkey_findcard()=%d\n", rc);
+               DEBUG_DBG("%s pkey_findcard()=%d\n", __func__, rc);
                if (rc)
                        break;
                if (copy_to_user(ufc, &kfc, sizeof(kfc)))
@@ -1140,7 +1145,7 @@  static long pkey_unlocked_ioctl(struct file *filp,
unsigned int cmd,
                if (copy_from_user(&ksp, usp, sizeof(ksp)))
                        return -EFAULT;
                rc = pkey_skey2pkey(&ksp.seckey, &ksp.protkey);
-               DEBUG_DBG("pkey_ioctl pkey_skey2pkey()=%d\n", rc);
+               DEBUG_DBG("%s pkey_skey2pkey()=%d\n", __func__, rc);
                if (rc)
                        break;
                if (copy_to_user(usp, &ksp, sizeof(ksp)))
@@ -1155,7 +1160,7 @@  static long pkey_unlocked_ioctl(struct file *filp,
unsigned int cmd,
                        return -EFAULT;
                rc = pkey_verifykey(&kvk.seckey, &kvk.cardnr, &kvk.domain,
                                    &kvk.keysize, &kvk.attributes);
-               DEBUG_DBG("pkey_ioctl pkey_verifykey()=%d\n", rc);
+               DEBUG_DBG("%s pkey_verifykey()=%d\n", __func__, rc);
                if (rc)
                        break;
                if (copy_to_user(uvk, &kvk, sizeof(kvk)))
diff --git a/drivers/s390/crypto/zcrypt_api.c
b/drivers/s390/crypto/zcrypt_api.c
index febcdb5..e685412 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -50,7 +50,7 @@  EXPORT_TRACEPOINT_SYMBOL(s390_zcrypt_req);
 EXPORT_TRACEPOINT_SYMBOL(s390_zcrypt_rep);

 static int zcrypt_hwrng_seed = 1;
-module_param_named(hwrng_seed, zcrypt_hwrng_seed, int, S_IRUSR|S_IRGRP);
+module_param_named(hwrng_seed, zcrypt_hwrng_seed, int, 0440);
 MODULE_PARM_DESC(hwrng_seed, "Turn on/off hwrng auto seed, default is 1
(on).");

 DEFINE_SPINLOCK(zcrypt_list_lock);
@@ -182,7 +182,8 @@  static inline void zcrypt_drop_queue(struct zcrypt_card
*zc,

 static inline bool zcrypt_card_compare(struct zcrypt_card *zc,
                                       struct zcrypt_card *pref_zc,
-                                      unsigned weight, unsigned
pref_weight)
+                                      unsigned int weight,
+                                      unsigned int pref_weight)
 {
        if (!pref_zc)
                return false;
@@ -196,7 +197,8 @@  static inline bool zcrypt_card_compare(struct
zcrypt_card *zc,

 static inline bool zcrypt_queue_compare(struct zcrypt_queue *zq,
                                        struct zcrypt_queue *pref_zq,
-                                       unsigned weight, unsigned
pref_weight)
+                                       unsigned int weight,
+                                       unsigned int pref_weight)
 {
        if (!pref_zq)
                return false;
@@ -792,6 +794,7 @@  static long zcrypt_unlocked_ioctl(struct file *filp,
unsigned int cmd,
        case ICARSAMODEXPO: {
                struct ica_rsa_modexpo __user *umex = (void __user *) arg;
                struct ica_rsa_modexpo mex;
+
                if (copy_from_user(&mex, umex, sizeof(mex)))
                        return -EFAULT;
                do {
@@ -811,6 +814,7 @@  static long zcrypt_unlocked_ioctl(struct file *filp,
unsigned int cmd,
        case ICARSACRT: {
                struct ica_rsa_modexpo_crt __user *ucrt = (void __user *)
arg;
                struct ica_rsa_modexpo_crt crt;
+
                if (copy_from_user(&crt, ucrt, sizeof(crt)))
                        return -EFAULT;
                do {
@@ -830,6 +834,7 @@  static long zcrypt_unlocked_ioctl(struct file *filp,
unsigned int cmd,
        case ZSECSENDCPRB: {
                struct ica_xcRB __user *uxcRB = (void __user *) arg;
                struct ica_xcRB xcRB;
+
                if (copy_from_user(&xcRB, uxcRB, sizeof(xcRB)))
                        return -EFAULT;
                do {
@@ -849,6 +854,7 @@  static long zcrypt_unlocked_ioctl(struct file *filp,
unsigned int cmd,
        case ZSENDEP11CPRB: {
                struct ep11_urb __user *uxcrb = (void __user *)arg;
                struct ep11_urb xcrb;
+
                if (copy_from_user(&xcrb, uxcrb, sizeof(xcrb)))
                        return -EFAULT;
                do {
@@ -1037,7 +1043,7 @@  static long trans_modexpo_crt32(struct file *filp,
unsigned int cmd,
                return -EFAULT;
        crt64.inputdata = compat_ptr(crt32.inputdata);
        crt64.inputdatalength = crt32.inputdatalength;
-       crt64.outputdata=  compat_ptr(crt32.outputdata);
+       crt64.outputdata = compat_ptr(crt32.outputdata);
        crt64.outputdatalength = crt32.outputdatalength;
        crt64.bp_key = compat_ptr(crt32.bp_key);
        crt64.bq_key = compat_ptr(crt32.bq_key);
@@ -1063,20 +1069,20 @@  struct compat_ica_xcRB {
        unsigned int    user_defined;
        unsigned short  request_ID;
        unsigned int    request_control_blk_length;
-       unsigned char   padding1[16 - sizeof (compat_uptr_t)];
+       unsigned char   padding1[16 - sizeof(compat_uptr_t)];
        compat_uptr_t   request_control_blk_addr;
        unsigned int    request_data_length;
-       char            padding2[16 - sizeof (compat_uptr_t)];
+       char            padding2[16 - sizeof(compat_uptr_t)];
        compat_uptr_t   request_data_address;
        unsigned int    reply_control_blk_length;
-       char            padding3[16 - sizeof (compat_uptr_t)];
+       char            padding3[16 - sizeof(compat_uptr_t)];
        compat_uptr_t   reply_control_blk_addr;
        unsigned int    reply_data_length;
-       char            padding4[16 - sizeof (compat_uptr_t)];
+       char            padding4[16 - sizeof(compat_uptr_t)];
        compat_uptr_t   reply_data_addr;
        unsigned short  priority_window;
        unsigned int    status;
-} __attribute__((packed));
+} __packed;

 static long trans_xcRB32(struct file *filp, unsigned int cmd,
                         unsigned long arg)
@@ -1120,7 +1126,7 @@  static long trans_xcRB32(struct file *filp, unsigned
int cmd,
        xcRB32.reply_data_length = xcRB64.reply_data_length;
        xcRB32.status = xcRB64.status;
        if (copy_to_user(uxcRB32, &xcRB32, sizeof(xcRB32)))
-                       return -EFAULT;
+               return -EFAULT;
        return rc;
 }

@@ -1182,10 +1188,10 @@  static int zcrypt_rng_data_read(struct hwrng *rng,
u32 *data)
                        rc = zcrypt_rng((char *) zcrypt_rng_buffer);
                if (rc < 0)
                        return -EIO;
-               zcrypt_rng_buffer_index = rc / sizeof *data;
+               zcrypt_rng_buffer_index = rc / sizeof(*data);
        }
        *data = zcrypt_rng_buffer[--zcrypt_rng_buffer_index];
-       return sizeof *data;
+       return sizeof(*data);
 }

 static struct hwrng zcrypt_rng_dev = {
diff --git a/drivers/s390/crypto/zcrypt_api.h
b/drivers/s390/crypto/zcrypt_api.h
index f149a8f..a848625 100644
--- a/drivers/s390/crypto/zcrypt_api.h
+++ b/drivers/s390/crypto/zcrypt_api.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  zcrypt 2.1.0
  *
diff --git a/drivers/s390/crypto/zcrypt_card.c
b/drivers/s390/crypto/zcrypt_card.c
index da2c8df..40cd4c1 100644
--- a/drivers/s390/crypto/zcrypt_card.c
+++ b/drivers/s390/crypto/zcrypt_card.c
@@ -38,28 +38,28 @@ 
  * Device attributes common for all crypto card devices.
  */

-static ssize_t zcrypt_card_type_show(struct device *dev,
-                                    struct device_attribute *attr, char
*buf)
+static ssize_t type_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
        struct zcrypt_card *zc = to_ap_card(dev)->private;

        return snprintf(buf, PAGE_SIZE, "%s\n", zc->type_string);
 }

-static DEVICE_ATTR(type, 0444, zcrypt_card_type_show, NULL);
+static DEVICE_ATTR_RO(type);

-static ssize_t zcrypt_card_online_show(struct device *dev,
-                                      struct device_attribute *attr,
-                                      char *buf)
+static ssize_t online_show(struct device *dev,
+                          struct device_attribute *attr,
+                          char *buf)
 {
        struct zcrypt_card *zc = to_ap_card(dev)->private;

        return snprintf(buf, PAGE_SIZE, "%d\n", zc->online);
 }

-static ssize_t zcrypt_card_online_store(struct device *dev,
-                                       struct device_attribute *attr,
-                                       const char *buf, size_t count)
+static ssize_t online_store(struct device *dev,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
        struct zcrypt_card *zc = to_ap_card(dev)->private;
        struct zcrypt_queue *zq;
@@ -80,19 +80,18 @@  static ssize_t zcrypt_card_online_store(struct device
*dev,
        return count;
 }

-static DEVICE_ATTR(online, 0644, zcrypt_card_online_show,
-                  zcrypt_card_online_store);
+static DEVICE_ATTR_RW(online);

-static ssize_t zcrypt_card_load_show(struct device *dev,
-                                    struct device_attribute *attr,
-                                    char *buf)
+static ssize_t load_show(struct device *dev,
+                        struct device_attribute *attr,
+                        char *buf)
 {
        struct zcrypt_card *zc = to_ap_card(dev)->private;

        return snprintf(buf, PAGE_SIZE, "%d\n", atomic_read(&zc->load));
 }

-static DEVICE_ATTR(load, 0444, zcrypt_card_load_show, NULL);
+static DEVICE_ATTR_RO(load);

 static struct attribute *zcrypt_card_attrs[] = {
        &dev_attr_type.attr,
diff --git a/drivers/s390/crypto/zcrypt_cca_key.h
b/drivers/s390/crypto/zcrypt_cca_key.h
index 1752622..e5b5c02 100644
--- a/drivers/s390/crypto/zcrypt_cca_key.h
+++ b/drivers/s390/crypto/zcrypt_cca_key.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  zcrypt 2.1.0
  *
@@ -31,7 +31,7 @@  struct cca_token_hdr {
        unsigned char  version;
        unsigned short token_length;
        unsigned char  reserved[4];
-} __attribute__((packed));
+} __packed;

 #define CCA_TKN_HDR_ID_EXT 0x1E

@@ -51,7 +51,7 @@  struct cca_public_sec {
        unsigned short exponent_len;
        unsigned short modulus_bit_len;
        unsigned short modulus_byte_len;    /* In a private key, this is 0
*/
-} __attribute__((packed));
+} __packed;

 /**
  * mapping for the cca private CRT key 'token'
@@ -85,7 +85,7 @@  struct cca_pvt_ext_CRT_sec {
        unsigned short pad_len;
        unsigned char  reserved4[52];
        unsigned char  confounder[8];
-} __attribute__((packed));
+} __packed;

 #define CCA_PVT_EXT_CRT_SEC_ID_PVT 0x08
 #define CCA_PVT_EXT_CRT_SEC_FMT_CL 0x40
@@ -114,7 +114,7 @@  static inline int zcrypt_type6_mex_key_en(struct
ica_rsa_modexpo *mex, void *p)
                struct cca_token_hdr pubHdr;
                struct cca_public_sec pubSec;
                char exponent[0];
-       } __attribute__((packed)) *key = p;
+       } __packed *key = p;
        unsigned char *temp;
        int i;

@@ -183,7 +183,7 @@  static inline int zcrypt_type6_crt_key(struct
ica_rsa_modexpo_crt *crt, void *p)
                struct cca_token_hdr token;
                struct cca_pvt_ext_CRT_sec pvt;
                char key_parts[0];
-       } __attribute__((packed)) *key = p;
+       } __packed *key = p;
        struct cca_public_sec *pub;
        int short_len, long_len, pad_len, key_len, size;

diff --git a/drivers/s390/crypto/zcrypt_cex2a.h
b/drivers/s390/crypto/zcrypt_cex2a.h
index c3c1167..66d58bc 100644
--- a/drivers/s390/crypto/zcrypt_cex2a.h
+++ b/drivers/s390/crypto/zcrypt_cex2a.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  zcrypt 2.1.0
  *
@@ -30,7 +30,7 @@  struct type50_hdr {
        unsigned char   reserved2;
        unsigned char   ignored;
        unsigned short  reserved3;
-} __attribute__((packed));
+} __packed;

 #define TYPE50_TYPE_CODE       0x50

@@ -49,7 +49,7 @@  struct type50_meb1_msg {
        unsigned char   exponent[128];
        unsigned char   modulus[128];
        unsigned char   message[128];
-} __attribute__((packed));
+} __packed;

 /* Mod-Exp, with a large modulus */
 struct type50_meb2_msg {
@@ -59,7 +59,7 @@  struct type50_meb2_msg {
        unsigned char   exponent[256];
        unsigned char   modulus[256];
        unsigned char   message[256];
-} __attribute__((packed));
+} __packed;

 /* Mod-Exp, with a larger modulus */
 struct type50_meb3_msg {
@@ -69,7 +69,7 @@  struct type50_meb3_msg {
        unsigned char   exponent[512];
        unsigned char   modulus[512];
        unsigned char   message[512];
-} __attribute__((packed));
+} __packed;

 /* CRT, with a small modulus */
 struct type50_crb1_msg {
@@ -82,7 +82,7 @@  struct type50_crb1_msg {
        unsigned char   dq[64];
        unsigned char   u[64];
        unsigned char   message[128];
-} __attribute__((packed));
+} __packed;

 /* CRT, with a large modulus */
 struct type50_crb2_msg {
@@ -95,7 +95,7 @@  struct type50_crb2_msg {
        unsigned char   dq[128];
        unsigned char   u[128];
        unsigned char   message[256];
-} __attribute__((packed));
+} __packed;

 /* CRT, with a larger modulus */
 struct type50_crb3_msg {
@@ -108,7 +108,7 @@  struct type50_crb3_msg {
        unsigned char   dq[256];
        unsigned char   u[256];
        unsigned char   message[512];
-} __attribute__((packed));
+} __packed;

 /**
  * The type 80 response family is associated with a CEX2A card.
@@ -128,7 +128,7 @@  struct type80_hdr {
        unsigned char   code;           /* 0x00 */
        unsigned char   reserved2[3];
        unsigned char   reserved3[8];
-} __attribute__((packed));
+} __packed;

 int zcrypt_cex2a_init(void);
 void zcrypt_cex2a_exit(void);
diff --git a/drivers/s390/crypto/zcrypt_error.h
b/drivers/s390/crypto/zcrypt_error.h
index 01598d8..6f7ebc1 100644
--- a/drivers/s390/crypto/zcrypt_error.h
+++ b/drivers/s390/crypto/zcrypt_error.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  zcrypt 2.1.0
  *
diff --git a/drivers/s390/crypto/zcrypt_msgtype50.c
b/drivers/s390/crypto/zcrypt_msgtype50.c
index afe1b2b..f159662 100644
--- a/drivers/s390/crypto/zcrypt_msgtype50.c
+++ b/drivers/s390/crypto/zcrypt_msgtype50.c
@@ -27,13 +27,14 @@ 
 #include "zcrypt_error.h"
 #include "zcrypt_msgtype50.h"

-#define CEX3A_MAX_MOD_SIZE     512     /* 4096 bits    */
+/* 4096 bits */
+#define CEX3A_MAX_MOD_SIZE 512

-#define CEX2A_MAX_RESPONSE_SIZE 0x110  /* max outputdatalength +
type80_hdr */
+/* max outputdatalength + type80_hdr */
+#define CEX2A_MAX_RESPONSE_SIZE 0x110

-#define CEX3A_MAX_RESPONSE_SIZE        0x210   /* 512 bit modulus
-                                        * (max outputdatalength) +
-                                        * type80_hdr*/
+/* 512 bit modulus, (max outputdatalength) + type80_hdr */
+#define CEX3A_MAX_RESPONSE_SIZE 0x210

 MODULE_AUTHOR("IBM Corporation");
 MODULE_DESCRIPTION("Cryptographic Accelerator (message type 50), " \
@@ -209,6 +210,7 @@  static int ICAMEX_msg_to_type50MEX_msg(struct
zcrypt_queue *zq,

        if (mod_len <= 128) {
                struct type50_meb1_msg *meb1 = ap_msg->message;
+
                memset(meb1, 0, sizeof(*meb1));
                ap_msg->length = sizeof(*meb1);
                meb1->header.msg_type_code = TYPE50_TYPE_CODE;
@@ -219,6 +221,7 @@  static int ICAMEX_msg_to_type50MEX_msg(struct
zcrypt_queue *zq,
                inp = meb1->message + sizeof(meb1->message) - mod_len;
        } else if (mod_len <= 256) {
                struct type50_meb2_msg *meb2 = ap_msg->message;
+
                memset(meb2, 0, sizeof(*meb2));
                ap_msg->length = sizeof(*meb2);
                meb2->header.msg_type_code = TYPE50_TYPE_CODE;
@@ -229,6 +232,7 @@  static int ICAMEX_msg_to_type50MEX_msg(struct
zcrypt_queue *zq,
                inp = meb2->message + sizeof(meb2->message) - mod_len;
        } else if (mod_len <= 512) {
                struct type50_meb3_msg *meb3 = ap_msg->message;
+
                memset(meb3, 0, sizeof(*meb3));
                ap_msg->length = sizeof(*meb3);
                meb3->header.msg_type_code = TYPE50_TYPE_CODE;
@@ -274,6 +278,7 @@  static int ICACRT_msg_to_type50CRT_msg(struct
zcrypt_queue *zq,
         */
        if (mod_len <= 128) {           /* up to 1024 bit key size */
                struct type50_crb1_msg *crb1 = ap_msg->message;
+
                memset(crb1, 0, sizeof(*crb1));
                ap_msg->length = sizeof(*crb1);
                crb1->header.msg_type_code = TYPE50_TYPE_CODE;
@@ -287,6 +292,7 @@  static int ICACRT_msg_to_type50CRT_msg(struct
zcrypt_queue *zq,
                inp = crb1->message + sizeof(crb1->message) - mod_len;
        } else if (mod_len <= 256) {    /* up to 2048 bit key size */
                struct type50_crb2_msg *crb2 = ap_msg->message;
+
                memset(crb2, 0, sizeof(*crb2));
                ap_msg->length = sizeof(*crb2);
                crb2->header.msg_type_code = TYPE50_TYPE_CODE;
@@ -301,6 +307,7 @@  static int ICACRT_msg_to_type50CRT_msg(struct
zcrypt_queue *zq,
        } else if ((mod_len <= 512) &&  /* up to 4096 bit key size */
                   (zq->zcard->max_mod_size == CEX3A_MAX_MOD_SIZE)) {
                struct type50_crb3_msg *crb3 = ap_msg->message;
+
                memset(crb3, 0, sizeof(*crb3));
                ap_msg->length = sizeof(*crb3);
                crb3->header.msg_type_code = TYPE50_TYPE_CODE;
diff --git a/drivers/s390/crypto/zcrypt_msgtype50.h
b/drivers/s390/crypto/zcrypt_msgtype50.h
index 0a36545..8530f65 100644
--- a/drivers/s390/crypto/zcrypt_msgtype50.h
+++ b/drivers/s390/crypto/zcrypt_msgtype50.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  zcrypt 2.1.0
  *
@@ -17,10 +17,10 @@ 
 #define MSGTYPE50_NAME                 "zcrypt_msgtype50"
 #define MSGTYPE50_VARIANT_DEFAULT      0

-#define MSGTYPE50_CRB2_MAX_MSG_SIZE    0x390 /*sizeof(struct
type50_crb2_msg)*/
-#define MSGTYPE50_CRB3_MAX_MSG_SIZE    0x710 /*sizeof(struct
type50_crb3_msg)*/
+#define MSGTYPE50_CRB2_MAX_MSG_SIZE 0x390 /* sizeof(struct
type50_crb2_msg) */
+#define MSGTYPE50_CRB3_MAX_MSG_SIZE 0x710 /* sizeof(struct
type50_crb3_msg) */

-#define MSGTYPE_ADJUSTMENT             0x08  /*type04 extension (not
needed in type50)*/
+#define MSGTYPE_ADJUSTMENT 0x08  /* type04 extension (not needed in
type50) */

 unsigned int get_rsa_modex_fc(struct ica_rsa_modexpo *, int *);
 unsigned int get_rsa_crt_fc(struct ica_rsa_modexpo_crt *, int *);
diff --git a/drivers/s390/crypto/zcrypt_msgtype6.c
b/drivers/s390/crypto/zcrypt_msgtype6.c
index e70ae07..2101776 100644
--- a/drivers/s390/crypto/zcrypt_msgtype6.c
+++ b/drivers/s390/crypto/zcrypt_msgtype6.c
@@ -421,8 +421,10 @@  static int XCRB_msg_to_type6CPRB_msgX(struct
ap_message *ap_msg,
        if (ap_msg->length > MSGTYPE06_MAX_MSG_SIZE)
                return -EINVAL;

-       /* Overflow check
-          sum must be greater (or equal) than the largest operand */
+       /*
+        * Overflow check
+        * sum must be greater (or equal) than the largest operand
+        */
        req_sumlen = CEIL4(xcRB->request_control_blk_length) +
                        xcRB->request_data_length;
        if ((CEIL4(xcRB->request_control_blk_length) <=
@@ -442,8 +444,10 @@  static int XCRB_msg_to_type6CPRB_msgX(struct
ap_message *ap_msg,
        if (replylen > MSGTYPE06_MAX_MSG_SIZE)
                return -EINVAL;

-       /* Overflow check
-          sum must be greater (or equal) than the largest operand */
+       /*
+        * Overflow check
+        * sum must be greater (or equal) than the largest operand
+        */
        resp_sumlen = CEIL4(xcRB->reply_control_blk_length) +
                        xcRB->reply_data_length;
        if ((CEIL4(xcRB->reply_control_blk_length) <=
xcRB->reply_data_length) ?
@@ -454,7 +458,7 @@  static int XCRB_msg_to_type6CPRB_msgX(struct ap_message
*ap_msg,

        /* prepare type6 header */
        msg->hdr = static_type6_hdrX;
-       memcpy(msg->hdr.agent_id , &(xcRB->agent_ID),
sizeof(xcRB->agent_ID));
+       memcpy(msg->hdr.agent_id, &(xcRB->agent_ID),
sizeof(xcRB->agent_ID));
        msg->hdr.ToCardLen1 = xcRB->request_control_blk_length;
        if (xcRB->request_data_length) {
                msg->hdr.offset2 = msg->hdr.offset1 + rcblen;
@@ -806,8 +810,10 @@  static int convert_response_ica(struct zcrypt_queue
*zq,
                if (msg->cprbx.cprb_ver_id == 0x02)
                        return convert_type86_ica(zq, reply,
                                                  outputdata,
outputdatalength);
-               /* Fall through, no break, incorrect cprb version is an
unknown
-                * response */
+               /*
+                * Fall through, no break, incorrect cprb version is an
unknown
+                * response
+                */
        default: /* Unknown response type, this should NEVER EVER happen */
                zq->online = 0;
                pr_err("Cryptographic device %02x.%04x failed and was set
offline\n",
@@ -840,8 +846,10 @@  static int convert_response_xcrb(struct zcrypt_queue
*zq,
                }
                if (msg->cprbx.cprb_ver_id == 0x02)
                        return convert_type86_xcrb(zq, reply, xcRB);
-               /* Fall through, no break, incorrect cprb version is an
unknown
-                * response */
+               /*
+                * Fall through, no break, incorrect cprb version is an
unknown
+                * response
+                */
        default: /* Unknown response type, this should NEVER EVER happen */
                xcRB->status = 0x0008044DL; /* HDD_InvalidParm */
                zq->online = 0;
@@ -901,8 +909,10 @@  static int convert_response_rng(struct zcrypt_queue
*zq,
                        return -EINVAL;
                if (msg->cprbx.cprb_ver_id == 0x02)
                        return convert_type86_rng(zq, reply, data);
-               /* Fall through, no break, incorrect cprb version is an
unknown
-                * response */
+               /*
+                * Fall through, no break, incorrect cprb version is an
unknown
+                * response
+                */
        default: /* Unknown response type, this should NEVER EVER happen */
                zq->online = 0;
                pr_err("Cryptographic device %02x.%04x failed and was set
offline\n",
@@ -1004,7 +1014,7 @@  static void zcrypt_msgtype6_receive_ep11(struct
ap_queue *aq,
                }
        } else {
                memcpy(msg->message, reply->message, sizeof(error_reply));
-         }
+       }
 out:
        complete(&(resp_type->work));
 }
diff --git a/drivers/s390/crypto/zcrypt_msgtype6.h
b/drivers/s390/crypto/zcrypt_msgtype6.h
index d314f45..e4c2f37 100644
--- a/drivers/s390/crypto/zcrypt_msgtype6.h
+++ b/drivers/s390/crypto/zcrypt_msgtype6.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  zcrypt 2.1.0
  *
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c
b/drivers/s390/crypto/zcrypt_pcixcc.c
index 159b0a0..0d639dd 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -95,7 +95,7 @@  static int zcrypt_pcixcc_rng_supported(struct ap_queue
*aq)
                struct type86_hdr hdr;
                struct type86_fmt2_ext fmt2;
                struct CPRBX cprbx;
-       } __attribute__((packed)) *reply;
+       } __packed *reply;
        struct {
                struct type6_hdr hdr;
                struct CPRBX cprbx;
@@ -104,7 +104,7 @@  static int zcrypt_pcixcc_rng_supported(struct ap_queue
*aq)
                char rule[8];
                short int verb_length;
                short int key_length;
-       } __packed * msg;
+       } __packed *msg;
        int rc, i;

        ap_init_message(&ap_msg);
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.h
b/drivers/s390/crypto/zcrypt_pcixcc.h
index d678a3a..cf73a0f 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.h
+++ b/drivers/s390/crypto/zcrypt_pcixcc.h
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  zcrypt 2.1.0
  *
diff --git a/drivers/s390/crypto/zcrypt_queue.c
b/drivers/s390/crypto/zcrypt_queue.c
index 91a52f2..8df82c6 100644
--- a/drivers/s390/crypto/zcrypt_queue.c
+++ b/drivers/s390/crypto/zcrypt_queue.c
@@ -38,18 +38,18 @@ 
  * Device attributes common for all crypto queue devices.
  */

-static ssize_t zcrypt_queue_online_show(struct device *dev,
-                                       struct device_attribute *attr,
-                                       char *buf)
+static ssize_t online_show(struct device *dev,
+                          struct device_attribute *attr,
+                          char *buf)
 {
        struct zcrypt_queue *zq = to_ap_queue(dev)->private;

        return snprintf(buf, PAGE_SIZE, "%d\n", zq->online);
 }

-static ssize_t zcrypt_queue_online_store(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t count)
+static ssize_t online_store(struct device *dev,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
        struct zcrypt_queue *zq = to_ap_queue(dev)->private;
        struct zcrypt_card *zc = zq->zcard;
@@ -72,19 +72,18 @@  static ssize_t zcrypt_queue_online_store(struct device
*dev,
        return count;
 }

-static DEVICE_ATTR(online, 0644, zcrypt_queue_online_show,
-                  zcrypt_queue_online_store);
+static DEVICE_ATTR_RW(online);

-static ssize_t zcrypt_queue_load_show(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
+static ssize_t load_show(struct device *dev,
+                        struct device_attribute *attr,
+                        char *buf)
 {
        struct zcrypt_queue *zq = to_ap_queue(dev)->private;

        return snprintf(buf, PAGE_SIZE, "%d\n", atomic_read(&zq->load));
 }

-static DEVICE_ATTR(load, 0444, zcrypt_queue_load_show, NULL);
+static DEVICE_ATTR_RO(load);

 static struct attribute *zcrypt_queue_attrs[] = {