7 files changed, 184 insertions, 95 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 7b0b81901297..a1ab3e3efd11 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -45,7 +45,7 @@ static int ap_poll_thread_start(void);
 static void ap_poll_thread_stop(void);
 static void ap_request_timeout(unsigned long);
-/**
+/*
 * Module description.
 */
 MODULE_AUTHOR("IBM Corporation");
@@ -53,7 +53,7 @@ MODULE_DESCRIPTION("Adjunct Processor Bus driver, "
                   "Copyright 2006 IBM Corporation");
 MODULE_LICENSE("GPL");
-/**
+/*
 * Module parameter
 */
 int ap_domain_index = -1;       /* Adjunct Processor Domain Index */
@@ -69,7 +69,7 @@ static struct device *ap_root_device = NULL;
 static DEFINE_SPINLOCK(ap_device_lock);
 static LIST_HEAD(ap_device_list);
-/**
+/*
 * Workqueue & timer for bus rescan.
 */
 static struct workqueue_struct *ap_work_queue;
@@ -77,7 +77,7 @@ static struct timer_list ap_config_timer;
 static int ap_config_time = AP_CONFIG_TIME;
 static DECLARE_WORK(ap_config_work, ap_scan_bus);
-/**
+/*
 * Tasklet & timer for AP request polling.
 */
 static struct timer_list ap_poll_timer = TIMER_INITIALIZER(ap_poll_timeout,0,0);
@@ -88,9 +88,9 @@ static struct task_struct *ap_poll_kthread = NULL;
 static DEFINE_MUTEX(ap_poll_thread_mutex);
 /**
- * Test if ap instructions are available.
+ * ap_intructions_available() - Test if AP instructions are available.
 *
- * Returns 0 if the ap instructions are installed.
+ * Returns 0 if the AP instructions are installed.
 */
 static inline int ap_instructions_available(void)
 {
@@ -108,12 +108,12 @@ static inline int ap_instructions_available(void)
 }
 /**
- * Test adjunct processor queue.
+ * ap_test_queue(): Test adjunct processor queue.
- * @qid: the ap queue number
+ * @qid: The AP queue number
- * @queue_depth: pointer to queue depth value
+ * @queue_depth: Pointer to queue depth value
- * @device_type: pointer to device type value
+ * @device_type: Pointer to device type value
 *
- * Returns ap queue status structure.
+ * Returns AP queue status structure.
 */
 static inline struct ap_queue_status
 ap_test_queue(ap_qid_t qid, int *queue_depth, int *device_type)
@@ -130,10 +130,10 @@ ap_test_queue(ap_qid_t qid, int *queue_depth, int *device_type)
 }
 /**
- * Reset adjunct processor queue.
+ * ap_reset_queue(): Reset adjunct processor queue.
- * @qid: the ap queue number
+ * @qid: The AP queue number
 *
- * Returns ap queue status structure.
+ * Returns AP queue status structure.
 */
 static inline struct ap_queue_status ap_reset_queue(ap_qid_t qid)
 {
@@ -148,16 +148,14 @@ static inline struct ap_queue_status ap_reset_queue(ap_qid_t qid)
 }
 /**
- * Send message to adjunct processor queue.
+ * __ap_send(): Send message to adjunct processor queue.
- * @qid: the ap queue number
+ * @qid: The AP queue number
- * @psmid: the program supplied message identifier
+ * @psmid: The program supplied message identifier
- * @msg: the message text
+ * @msg: The message text
- * @length: the message length
+ * @length: The message length
- *
- * Returns ap queue status structure.
 *
+ * Returns AP queue status structure.
 * Condition code 1 on NQAP can't happen because the L bit is 1.
- *
 * Condition code 2 on NQAP also means the send is incomplete,
 * because a segment boundary was reached. The NQAP is repeated.
 */
@@ -198,23 +196,20 @@ int ap_send(ap_qid_t qid, unsigned long long psmid, void *msg, size_t length)
 }
 EXPORT_SYMBOL(ap_send);
-/*
+/**
- * Receive message from adjunct processor queue.
+ * __ap_recv(): Receive message from adjunct processor queue.
- * @qid: the ap queue number
+ * @qid: The AP queue number
- * @psmid: pointer to program supplied message identifier
+ * @psmid: Pointer to program supplied message identifier
- * @msg: the message text
+ * @msg: The message text
- * @length: the message length
+ * @length: The message length
- *
- * Returns ap queue status structure.
 *
+ * Returns AP queue status structure.
 * Condition code 1 on DQAP means the receive has taken place
 * but only partially.  The response is incomplete, hence the
 * DQAP is repeated.
- *
 * Condition code 2 on DQAP also means the receive is incomplete,
 * this time because a segment boundary was reached. Again, the
 * DQAP is repeated.
- *
 * Note that gpr2 is used by the DQAP instruction to keep track of
 * any 'residual' length, in case the instruction gets interrupted.
 * Hence it gets zeroed before the instruction.
@@ -263,11 +258,12 @@ int ap_recv(ap_qid_t qid, unsigned long long *psmid, void *msg, size_t length)
 EXPORT_SYMBOL(ap_recv);
 /**
- * Check if an AP queue is available. The test is repeated for
+ * ap_query_queue(): Check if an AP queue is available.
- * AP_MAX_RESET times.
+ * @qid: The AP queue number
- * @qid: the ap queue number
+ * @queue_depth: Pointer to queue depth value
- * @queue_depth: pointer to queue depth value
+ * @device_type: Pointer to device type value
- * @device_type: pointer to device type value
+ *
+ * The test is repeated for AP_MAX_RESET times.
 */
 static int ap_query_queue(ap_qid_t qid, int *queue_depth, int *device_type)
 {
@@ -308,8 +304,10 @@ static int ap_query_queue(ap_qid_t qid, int *queue_depth, int *device_type)
 }
 /**
+ * ap_init_queue(): Reset an AP queue.
+ * @qid: The AP queue number
+ *
 * Reset an AP queue and wait for it to become available again.
- * @qid: the ap queue number
 */
 static int ap_init_queue(ap_qid_t qid)
 {
@@ -346,7 +344,10 @@ static int ap_init_queue(ap_qid_t qid)
 }
 /**
- * Arm request timeout if a AP device was idle and a new request is submitted.
+ * ap_increase_queue_count(): Arm request timeout.
+ * @ap_dev: Pointer to an AP device.
+ *
+ * Arm request timeout if an AP device was idle and a new request is submitted.
 */
 static void ap_increase_queue_count(struct ap_device *ap_dev)
 {
@@ -360,7 +361,10 @@ static void ap_increase_queue_count(struct ap_device *ap_dev)
 }
 /**
- * AP device is still alive, re-schedule request timeout if there are still
+ * ap_decrease_queue_count(): Decrease queue count.
+ * @ap_dev: Pointer to an AP device.
+ *
+ * If AP device is still alive, re-schedule request timeout if there are still
 * pending requests.
 */
 static void ap_decrease_queue_count(struct ap_device *ap_dev)
@@ -371,7 +375,7 @@ static void ap_decrease_queue_count(struct ap_device *ap_dev)
        if (ap_dev->queue_count > 0)
                mod_timer(&ap_dev->timeout, jiffies + timeout);
        else
-                /**
+                /*
                 * The timeout timer should to be disabled now - since
                 * del_timer_sync() is very expensive, we just tell via the
                 * reset flag to ignore the pending timeout timer.
@@ -379,7 +383,7 @@ static void ap_decrease_queue_count(struct ap_device *ap_dev)
                ap_dev->reset = AP_RESET_IGNORE;
 }
-/**
+/*
 * AP device related attributes.
 */
 static ssize_t ap_hwtype_show(struct device *dev,
@@ -433,6 +437,10 @@ static struct attribute_group ap_dev_attr_group = {
 };
 /**
+ * ap_bus_match()
+ * @dev: Pointer to device
+ * @drv: Pointer to device_driver
+ *
 * AP bus driver registration/unregistration.
 */
 static int ap_bus_match(struct device *dev, struct device_driver *drv)
@@ -441,7 +449,7 @@ static int ap_bus_match(struct device *dev, struct device_driver *drv)
        struct ap_driver *ap_drv = to_ap_drv(drv);
        struct ap_device_id *id;
-        /**
+        /*
         * Compare device type of the device with the list of
         * supported types of the device_driver.
         */
@@ -455,8 +463,12 @@ static int ap_bus_match(struct device *dev, struct device_driver *drv)
 }
 /**
- * uevent function for AP devices. It sets up a single environment
+ * ap_uevent(): Uevent function for AP devices.
- * variable DEV_TYPE which contains the hardware device type.
+ * @dev: Pointer to device
+ * @env: Pointer to kobj_uevent_env
+ *
+ * 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)
 {
@@ -500,8 +512,10 @@ static int ap_device_probe(struct device *dev)
 }
 /**
+ * __ap_flush_queue(): Flush requests.
+ * @ap_dev: Pointer to the AP device
+ *
 * Flush all requests from the request/pending queue of an AP device.
- * @ap_dev: pointer to the AP device.
 */
 static void __ap_flush_queue(struct ap_device *ap_dev)
 {
@@ -565,7 +579,7 @@ void ap_driver_unregister(struct ap_driver *ap_drv)
 }
 EXPORT_SYMBOL(ap_driver_unregister);
-/**
+/*
 * AP bus attributes.
 */
 static ssize_t ap_domain_show(struct bus_type *bus, char *buf)
@@ -630,14 +644,16 @@ static struct bus_attribute *const ap_bus_attrs[] = {
 };
 /**
- * Pick one of the 16 ap domains.
+ * ap_select_domain(): Select an AP domain.
+ *
+ * Pick one of the 16 AP domains.
 */
 static int ap_select_domain(void)
 {
        int queue_depth, device_type, count, max_count, best_domain;
        int rc, i, j;
-        /**
+        /*
         * We want to use a single domain. Either the one specified with
         * the "domain=" parameter or the domain with the maximum number
         * of devices.
@@ -669,8 +685,10 @@ static int ap_select_domain(void)
 }
 /**
- * Find the device type if query queue returned a device type of 0.
+ * ap_probe_device_type(): Find the device type of an AP.
 * @ap_dev: pointer to the AP device.
+ *
+ * Find the device type if query queue returned a device type of 0.
 */
 static int ap_probe_device_type(struct ap_device *ap_dev)
 {
@@ -764,7 +782,11 @@ out:
 }
 /**
- * Scan the ap bus for new devices.
+ * __ap_scan_bus(): Scan the AP bus.
+ * @dev: Pointer to device
+ * @data: Pointer to data
+ *
+ * Scan the AP bus for new devices.
 */
 static int __ap_scan_bus(struct device *dev, void *data)
 {
@@ -867,6 +889,8 @@ ap_config_timeout(unsigned long ptr)
 }
 /**
+ * ap_schedule_poll_timer(): Schedule poll timer.
+ *
 * Set up the timer to run the poll tasklet
 */
 static inline void ap_schedule_poll_timer(void)
@@ -877,10 +901,11 @@ static inline void ap_schedule_poll_timer(void)
 }
 /**
- * Receive pending reply messages from an AP device.
+ * ap_poll_read(): Receive pending reply messages from an AP device.
 * @ap_dev: pointer to the AP device
 * @flags: pointer to control flags, bit 2^0 is set if another poll is
 *         required, bit 2^1 is set if the poll timer needs to get armed
+ *
 * Returns 0 if the device is still present, -ENODEV if not.
 */
 static int ap_poll_read(struct ap_device *ap_dev, unsigned long *flags)
@@ -925,10 +950,11 @@ static int ap_poll_read(struct ap_device *ap_dev, unsigned long *flags)
 }
 /**
- * Send messages from the request queue to an AP device.
+ * ap_poll_write(): Send messages from the request queue to an AP device.
 * @ap_dev: pointer to the AP device
 * @flags: pointer to control flags, bit 2^0 is set if another poll is
 *         required, bit 2^1 is set if the poll timer needs to get armed
+ *
 * Returns 0 if the device is still present, -ENODEV if not.
 */
 static int ap_poll_write(struct ap_device *ap_dev, unsigned long *flags)
@@ -968,11 +994,13 @@ static int ap_poll_write(struct ap_device *ap_dev, unsigned long *flags)
 }
 /**
- * Poll AP device for pending replies and send new messages. If either
+ * ap_poll_queue(): Poll AP device for pending replies and send new messages.
- * ap_poll_read or ap_poll_write returns -ENODEV unregister the device.
 * @ap_dev: pointer to the bus device
 * @flags: pointer to control flags, bit 2^0 is set if another poll is
 *         required, bit 2^1 is set if the poll timer needs to get armed
+ *
+ * Poll AP device for pending replies and send new messages. If either
+ * ap_poll_read or ap_poll_write returns -ENODEV unregister the device.
 * Returns 0.
 */
 static inline int ap_poll_queue(struct ap_device *ap_dev, unsigned long *flags)
@@ -986,9 +1014,11 @@ static inline int ap_poll_queue(struct ap_device *ap_dev, unsigned long *flags)
 }
 /**
- * Queue a message to a device.
+ * __ap_queue_message(): Queue a message to a device.
 * @ap_dev: pointer to the AP device
 * @ap_msg: the message to be queued
+ *
+ * Queue a message to a device. Returns 0 if successful.
 */
 static int __ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
 {
@@ -1055,12 +1085,14 @@ void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
 EXPORT_SYMBOL(ap_queue_message);
 /**
+ * ap_cancel_message(): Cancel a crypto request.
+ * @ap_dev: The AP device that has the message queued
+ * @ap_msg: The message that is to be removed
+ *
 * Cancel a crypto request. This is done by removing the request
- * from the devive pendingq or requestq queue. Note that the
+ * from the device pending or request queue. Note that the
 * request stays on the AP queue. When it finishes the message
 * reply will be discarded because the psmid can't be found.
- * @ap_dev: AP device that has the message queued
- * @ap_msg: the message that is to be removed
 */
 void ap_cancel_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
 {
@@ -1082,7 +1114,10 @@ void ap_cancel_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
 EXPORT_SYMBOL(ap_cancel_message);
 /**
- * AP receive polling for finished AP requests
+ * ap_poll_timeout(): AP receive polling for finished AP requests.
+ * @unused: Unused variable.
+ *
+ * Schedules the AP tasklet.
 */
 static void ap_poll_timeout(unsigned long unused)
 {
@@ -1090,6 +1125,9 @@ static void ap_poll_timeout(unsigned long unused)
 }
 /**
+ * ap_reset(): Reset a not responding AP device.
+ * @ap_dev: Pointer to the AP device
+ *
 * Reset a not responding AP device and move all requests from the
 * pending queue to the request queue.
 */
@@ -1108,11 +1146,6 @@ static void ap_reset(struct ap_device *ap_dev)
                ap_dev->unregistered = 1;
 }
-/**
- * Poll all AP devices on the bus in a round robin fashion. Continue
- * polling until bit 2^0 of the control flags is not set. If bit 2^1
- * of the control flags has been set arm the poll timer.
- */
 static int __ap_poll_all(struct ap_device *ap_dev, unsigned long *flags)
 {
        spin_lock(&ap_dev->lock);
@@ -1126,6 +1159,14 @@ static int __ap_poll_all(struct ap_device *ap_dev, unsigned long *flags)
        return 0;
 }
+/**
+ * ap_poll_all(): Poll all AP devices.
+ * @dummy: Unused variable
+ *
+ * Poll all AP devices on the bus in a round robin fashion. Continue
+ * polling until bit 2^0 of the control flags is not set. If bit 2^1
+ * of the control flags has been set arm the poll timer.
+ */
 static void ap_poll_all(unsigned long dummy)
 {
        unsigned long flags;
@@ -1144,6 +1185,9 @@ static void ap_poll_all(unsigned long dummy)
 }
 /**
+ * ap_poll_thread(): Thread that polls for finished requests.
+ * @data: Unused pointer
+ *
 * AP bus poll thread. The purpose of this thread is to poll for
 * finished requests in a loop if there is a "free" cpu - that is
 * a cpu that doesn't have anything better to do. The polling stops
@@ -1213,7 +1257,10 @@ static void ap_poll_thread_stop(void)
 }
 /**
- * Handling of request timeouts
+ * ap_request_timeout(): Handling of request timeouts
+ * @data: Holds the AP device.
+ *
+ * Handles request timeouts.
 */
 static void ap_request_timeout(unsigned long data)
 {
@@ -1246,7 +1293,9 @@ static struct reset_call ap_reset_call = {
 };
 /**
- * The module initialization code.
+ * ap_module_init(): The module initialization code.
+ *
+ * Initializes the module.
 */
 int __init ap_module_init(void)
 {
@@ -1288,7 +1337,7 @@ int __init ap_module_init(void)
        if (ap_select_domain() == 0)
                ap_scan_bus(NULL);
-        /* Setup the ap bus rescan timer. */
+        /* Setup the AP bus rescan timer. */
        init_timer(&ap_config_timer);
        ap_config_timer.function = ap_config_timeout;
        ap_config_timer.data = 0;
@@ -1325,7 +1374,9 @@ static int __ap_match_all(struct device *dev, void *data)
 }
 /**
- * The module termination code
+ * ap_modules_exit(): The module termination code
+ *
+ * Terminates the module.
 */
 void ap_module_exit(void)
 {
diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index 87c2d6442875..c1e1200c43fc 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -50,6 +50,15 @@ typedef unsigned int ap_qid_t;
 #define AP_QID_QUEUE(_qid) ((_qid) & 15)
 /**
+ * structy ap_queue_status - Holds the AP queue status.
+ * @queue_empty: Shows if queue is empty
+ * @replies_waiting: Waiting replies
+ * @queue_full: Is 1 if the queue is full
+ * @pad: A 4 bit pad
+ * @int_enabled: Shows if interrupts are enabled for the AP
+ * @response_conde: Holds the 8 bit response code
+ * @pad2: A 16 bit pad
+ *
 * The ap queue status word is returned by all three AP functions
 * (PQAP, NQAP and DQAP).  There's a set of flags in the first
 * byte, followed by a 1 byte response code.
@@ -75,7 +84,7 @@ struct ap_queue_status {
 #define AP_RESPONSE_NO_FIRST_PART       0x13
 #define AP_RESPONSE_MESSAGE_TOO_BIG     0x15
-/**
+/*
 * Known device types
 */
 #define AP_DEVICE_TYPE_PCICC    3
@@ -84,7 +93,7 @@ struct ap_queue_status {
 #define AP_DEVICE_TYPE_CEX2A    6
 #define AP_DEVICE_TYPE_CEX2C    7
-/**
+/*
 * AP reset flag states
 */
 #define AP_RESET_IGNORE 0       /* request timeout will be ignored */
@@ -152,7 +161,7 @@ struct ap_message {
        .dev_type=(dt),                                 \
        .match_flags=AP_DEVICE_ID_MATCH_DEVICE_TYPE,
-/**
+/*
 * Note: don't use ap_send/ap_recv after using ap_queue_message
 * for the first time. Otherwise the ap message queue will get
 * confused.
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index b2740ff2e615..4d36e805a234 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -40,7 +40,7 @@
 #include "zcrypt_api.h"
-/**
+/*
 * Module description.
 */
 MODULE_AUTHOR("IBM Corporation");
@@ -56,7 +56,7 @@ static atomic_t zcrypt_open_count = ATOMIC_INIT(0);
 static int zcrypt_rng_device_add(void);
 static void zcrypt_rng_device_remove(void);
-/**
+/*
 * Device attributes common for all crypto devices.
 */
 static ssize_t zcrypt_type_show(struct device *dev,
@@ -103,6 +103,9 @@ static struct attribute_group zcrypt_device_attr_group = {
 };
 /**
+ * __zcrypt_increase_preference(): Increase preference of a crypto device.
+ * @zdev: Pointer the crypto device
+ *
 * Move the device towards the head of the device list.
 * Need to be called while holding the zcrypt device list lock.
 * Note: cards with speed_rating of 0 are kept at the end of the list.
@@ -129,6 +132,9 @@ static void __zcrypt_increase_preference(struct zcrypt_device *zdev)
 }
 /**
+ * __zcrypt_decrease_preference(): Decrease preference of a crypto device.
+ * @zdev: Pointer to a crypto device.
+ *
 * Move the device towards the tail of the device list.
 * Need to be called while holding the zcrypt device list lock.
 * Note: cards with speed_rating of 0 are kept at the end of the list.
@@ -202,7 +208,10 @@ void zcrypt_device_free(struct zcrypt_device *zdev)
 EXPORT_SYMBOL(zcrypt_device_free);
 /**
- * Register a crypto device.
+ * zcrypt_device_register() - Register a crypto device.
+ * @zdev: Pointer to a crypto device
+ *
+ * Register a crypto device. Returns 0 if successful.
 */
 int zcrypt_device_register(struct zcrypt_device *zdev)
 {
@@ -242,6 +251,9 @@ out:
 EXPORT_SYMBOL(zcrypt_device_register);
 /**
+ * zcrypt_device_unregister(): Unregister a crypto device.
+ * @zdev: Pointer to crypto device
+ *
 * Unregister a crypto device.
 */
 void zcrypt_device_unregister(struct zcrypt_device *zdev)
@@ -260,7 +272,9 @@ void zcrypt_device_unregister(struct zcrypt_device *zdev)
 EXPORT_SYMBOL(zcrypt_device_unregister);
 /**
- * zcrypt_read is not be supported beyond zcrypt 1.3.1
+ * zcrypt_read (): Not supported beyond zcrypt 1.3.1.
+ *
+ * This function is not supported beyond zcrypt 1.3.1.
 */
 static ssize_t zcrypt_read(struct file *filp, char __user *buf,
                           size_t count, loff_t *f_pos)
@@ -269,6 +283,8 @@ static ssize_t zcrypt_read(struct file *filp, char __user *buf,
 }
 /**
+ * zcrypt_write(): Not allowed.
+ *
 * Write is is not allowed
 */
 static ssize_t zcrypt_write(struct file *filp, const char __user *buf,
@@ -278,7 +294,9 @@ static ssize_t zcrypt_write(struct file *filp, const char __user *buf,
 }
 /**
- * Device open/close functions to count number of users.
+ * zcrypt_open(): Count number of users.
+ *
+ * Device open function to count number of users.
 */
 static int zcrypt_open(struct inode *inode, struct file *filp)
 {
@@ -286,13 +304,18 @@ static int zcrypt_open(struct inode *inode, struct file *filp)
        return 0;
 }
+/**
+ * zcrypt_release(): Count number of users.
+ *
+ * Device close function to count number of users.
+ */
 static int zcrypt_release(struct inode *inode, struct file *filp)
 {
        atomic_dec(&zcrypt_open_count);
        return 0;
 }
-/**
+/*
 * zcrypt ioctls.
 */
 static long zcrypt_rsa_modexpo(struct ica_rsa_modexpo *mex)
@@ -302,7 +325,7 @@ static long zcrypt_rsa_modexpo(struct ica_rsa_modexpo *mex)
        if (mex->outputdatalength < mex->inputdatalength)
                return -EINVAL;
-        /**
+        /*
         * As long as outputdatalength is big enough, we can set the
         * outputdatalength equal to the inputdatalength, since that is the
         * number of bytes we will copy in any case
@@ -348,7 +371,7 @@ static long zcrypt_rsa_crt(struct ica_rsa_modexpo_crt *crt)
        if (crt->outputdatalength < crt->inputdatalength ||
            (crt->inputdatalength & 1))
                return -EINVAL;
-        /**
+        /*
         * As long as outputdatalength is big enough, we can set the
         * outputdatalength equal to the inputdatalength, since that is the
         * number of bytes we will copy in any case
@@ -365,7 +388,7 @@ static long zcrypt_rsa_crt(struct ica_rsa_modexpo_crt *crt)
                    zdev->max_mod_size < crt->inputdatalength)
                        continue;
                if (zdev->short_crt && crt->inputdatalength > 240) {
-                        /**
+                        /*
                         * Check inputdata for leading zeros for cards
                         * that can't handle np_prime, bp_key, or
                         * u_mult_inv > 128 bytes.
@@ -381,7 +404,7 @@ static long zcrypt_rsa_crt(struct ica_rsa_modexpo_crt *crt)
                                    copy_from_user(&z3, crt->u_mult_inv, len))
                                        return -EFAULT;
                                copied = 1;
-                                /**
+                                /*
                                 * We have to restart device lookup -
                                 * the device list may have changed by now.
                                 */
@@ -567,6 +590,8 @@ static int zcrypt_count_type(int type)
 }
 /**
+ * zcrypt_ica_status(): Old, depracted combi status call.
+ *
 * Old, deprecated combi status call.
 */
 static long zcrypt_ica_status(struct file *filp, unsigned long arg)
@@ -668,7 +693,7 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
                                (int __user *) arg);
        case Z90STAT_DOMAIN_INDEX:
                return put_user(ap_domain_index, (int __user *) arg);
-        /**
+        /*
         * Deprecated ioctls. Don't add another device count ioctl,
         * you can count them yourself in the user space with the
         * output of the Z90STAT_STATUS_MASK ioctl.
@@ -706,7 +731,7 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
 }
 #ifdef CONFIG_COMPAT
-/**
+/*
 * ioctl32 conversion routines
 */
 struct compat_ica_rsa_modexpo {
@@ -857,7 +882,7 @@ static long zcrypt_compat_ioctl(struct file *filp, unsigned int cmd,
 }
 #endif
-/**
+/*
 * Misc device file operations.
 */
 static const struct file_operations zcrypt_fops = {
@@ -872,7 +897,7 @@ static const struct file_operations zcrypt_fops = {
        .release        = zcrypt_release
 };
-/**
+/*
 * Misc device.
 */
 static struct miscdevice zcrypt_misc_device = {
@@ -881,7 +906,7 @@ static struct miscdevice zcrypt_misc_device = {
        .fops       = &zcrypt_fops,
 };
-/**
+/*
 * Deprecated /proc entry support.
 */
 static struct proc_dir_entry *zcrypt_entry;
@@ -1075,7 +1100,7 @@ static int zcrypt_status_write(struct file *file, const char __user *buffer,
        }
        for (j = 0; j < 64 && *ptr; ptr++) {
-                /**
+                /*
                 * '0' for no device, '1' for PCICA, '2' for PCICC,
                 * '3' for PCIXCC_MCL2, '4' for PCIXCC_MCL3,
                 * '5' for CEX2C and '6' for CEX2A'
@@ -1103,7 +1128,7 @@ static int zcrypt_rng_data_read(struct hwrng *rng, u32 *data)
 {
        int rc;
-        /**
+        /*
         * We don't need locking here because the RNG API guarantees serialized
         * read method calls.
         */
@@ -1162,6 +1187,8 @@ static void zcrypt_rng_device_remove(void)
 }
 /**
+ * zcrypt_api_init(): Module initialization.
+ *
 * The module initialization code.
 */
 int __init zcrypt_api_init(void)
@@ -1196,6 +1223,8 @@ out:
 }
 /**
+ * zcrypt_api_exit(): Module termination.
+ *
 * The module termination code.
 */
 void zcrypt_api_exit(void)
diff --git a/drivers/s390/crypto/zcrypt_cca_key.h b/drivers/s390/crypto/zcrypt_cca_key.h
index 8dbcf0eef3e5..ed82f2f59b17 100644
--- a/drivers/s390/crypto/zcrypt_cca_key.h
+++ b/drivers/s390/crypto/zcrypt_cca_key.h
@@ -174,7 +174,7 @@ static inline int zcrypt_type6_mex_key_de(struct ica_rsa_modexpo *mex,
        key->pvtMeHdr = static_pvt_me_hdr;
        key->pvtMeSec = static_pvt_me_sec;
        key->pubMeSec = static_pub_me_sec;
-        /**
+        /*
         * In a private key, the modulus doesn't appear in the public
         * section. So, an arbitrary public exponent of 0x010001 will be
         * used.
@@ -338,7 +338,7 @@ static inline int zcrypt_type6_crt_key(struct ica_rsa_modexpo_crt *crt,
        pub = (struct cca_public_sec *)(key->key_parts + key_len);
        *pub = static_cca_pub_sec;
        pub->modulus_bit_len = 8 * crt->inputdatalength;
-        /**
+        /*
         * In a private key, the modulus doesn't appear in the public
         * section. So, an arbitrary public exponent of 0x010001 will be
         * used.
diff --git a/drivers/s390/crypto/zcrypt_error.h b/drivers/s390/crypto/zcrypt_error.h
index 2cb616ba8bec..3e27fe77d207 100644
--- a/drivers/s390/crypto/zcrypt_error.h
+++ b/drivers/s390/crypto/zcrypt_error.h
@@ -108,7 +108,7 @@ static inline int convert_error(struct zcrypt_device *zdev,
                return -EINVAL;
        case REP82_ERROR_MESSAGE_TYPE:
        //   REP88_ERROR_MESSAGE_TYPE           // '20' CEX2A
-                /**
+                /*
                 * To sent a message of the wrong type is a bug in the
                 * device driver. Warn about it, disable the device
                 * and then repeat the request.
diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
index d6d59bf9ac38..17ea56ce1c11 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -42,7 +42,7 @@
 #define PCICC_MAX_MOD_SIZE_OLD  128     /* 1024 bits */
 #define PCICC_MAX_MOD_SIZE      256     /* 2048 bits */
-/**
+/*
 * PCICC cards need a speed rating of 0. This keeps them at the end of
 * the zcrypt device list (see zcrypt_api.c). PCICC cards are only
 * used if no other cards are present because they are slow and can only
@@ -388,7 +388,7 @@ static int convert_type86(struct zcrypt_device *zdev,
        reply_len = le16_to_cpu(msg->length) - 2;
        if (reply_len > outputdatalength)
                return -EINVAL;
-        /**
+        /*
         * For all encipher requests, the length of the ciphertext (reply_len)
         * will always equal the modulus length. For MEX decipher requests
         * the output needs to get padded. Minimum pad size is 10.
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index 3674bfa82b65..0bc9b3188e64 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -501,7 +501,7 @@ static int convert_type86_ica(struct zcrypt_device *zdev,
        reply_len = msg->length - 2;
        if (reply_len > outputdatalength)
                return -EINVAL;
-        /**
+        /*
         * For all encipher requests, the length of the ciphertext (reply_len)
         * will always equal the modulus length. For MEX decipher requests
         * the output needs to get padded. Minimum pad size is 10.