s390: Fix various typos

Run codespell on arch/s390 and drivers/s390 and fix all typos.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c
index c8f149ad77e584cba92fcac3e33fb6bd9caab688..bf145965baf2d88a1a1005dd7f29cb45258314a2 100644 (file)
--- a/arch/s390/boot/startup.c
+++ b/arch/s390/boot/startup.c
@@ -480,7 +480,7 @@ void startup_kernel(void)
         * __vmlinux_relocs_64_end as the lower range address. However,
         * .amode31 section is written to by the decompressed kernel - at
         * that time the contents of .vmlinux.relocs is not needed anymore.
-        * Conversly, .vmlinux.relocs is read only by the decompressor, even
+        * Conversely, .vmlinux.relocs is read only by the decompressor, even
         * before the kernel started. Therefore, in case the two sections
         * overlap there is no risk of corrupting any data.
         */

diff --git a/arch/s390/include/uapi/asm/dasd.h b/arch/s390/include/uapi/asm/dasd.h
index b11d988004584527e4e54e9ed77bae0a4c52b120..7c364b33c84dce249efb08f793be4ad18f93c8dd 100644 (file)
--- a/arch/s390/include/uapi/asm/dasd.h
+++ b/arch/s390/include/uapi/asm/dasd.h
@@ -294,7 +294,7 @@ struct dasd_snid_ioctl_data {
 /********************************************************************************
  * SECTION: Definition of IOCTLs
  *
- * Here ist how the ioctl-nr should be used:
+ * Here is how the ioctl-nr should be used:
  *    0 -   31   DASD driver itself
  *   32 -  239   still open
  *  240 -  255  reserved for EMC

diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index e62bea9ab21e6a404d874ed4bfcad0b9076f2174..b3f2103694e411042be0cc972c315148043cf266 100644 (file)
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -38,13 +38,13 @@
 
 typedef struct file_private_info {
        loff_t offset;                  /* offset of last read in file */
-       int    act_area;                /* number of last formated area */
+       int    act_area;                /* number of last formatted area */
        int    act_page;                /* act page in given area */
-       int    act_entry;               /* last formated entry (offset */
+       int    act_entry;               /* last formatted entry (offset */
                                        /* relative to beginning of last */
-                                       /* formated page) */
+                                       /* formatted page) */
        size_t act_entry_offset;        /* up to this offset we copied */
-                                       /* in last read the last formated */
+                                       /* in last read the last formatted */
                                        /* entry to userland */
        char   temp_buf[2048];          /* buffer for output */
        debug_info_t *debug_info_org;   /* original debug information */
@@ -63,7 +63,7 @@ typedef struct {
        long args[];
 } debug_sprintf_entry_t;
 
-/* internal function prototyes */
+/* internal function prototypes */
 
 static int debug_init(void);
 static ssize_t debug_output(struct file *file, char __user *user_buf,
@@ -380,7 +380,7 @@ static void debug_info_put(debug_info_t *db_info)
 
 /*
  * debug_format_entry:
- * - format one debug entry and return size of formated data
+ * - format one debug entry and return size of formatted data
  */
 static int debug_format_entry(file_private_info_t *p_info)
 {
@@ -449,7 +449,7 @@ out:
 /*
  * debug_output:
  * - called for user read()
- * - copies formated debug entries to the user buffer
+ * - copies formatted debug entries to the user buffer
  */
 static ssize_t debug_output(struct file *file,         /* file descriptor */
                            char __user *user_buf,      /* user buffer */
@@ -523,7 +523,7 @@ static ssize_t debug_input(struct file *file, const char __user *user_buf,
 /*
  * debug_open:
  * - called for user open()
- * - copies formated output to private_data area of the file
+ * - copies formatted output to private_data area of the file
  *   handle
  */
 static int debug_open(struct inode *inode, struct file *file)
@@ -1513,7 +1513,7 @@ int debug_dflt_header_fn(debug_info_t *id, struct debug_view *view,
 EXPORT_SYMBOL(debug_dflt_header_fn);
 
 /*
- * prints debug data sprintf-formated:
+ * prints debug data sprintf-formatted:
  * debug_sprinf_event/exception calls must be used together with this view
  */
 

diff --git a/arch/s390/kernel/os_info.c b/arch/s390/kernel/os_info.c
index b695f980bbde030806925e6fce10969a69651ee5..29080d6d5d8d2fb590a69947a4abfd4ef14c88d0 100644 (file)
--- a/arch/s390/kernel/os_info.c
+++ b/arch/s390/kernel/os_info.c
@@ -180,7 +180,7 @@ fail:
 }
 
 /*
- * Return pointer to os infor entry and its size
+ * Return pointer to os info entry and its size
  */
 void *os_info_old_entry(int nr, unsigned long *size)
 {

diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index b32da69c2281b1e088f2a273d87835ccbd4355be..e0e178073cb58a09559c1254e1beb79f532b422c 100644 (file)
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -1054,7 +1054,7 @@ static void cpumf_pmu_del(struct perf_event *event, int flags)
         *
         * When a new perf event has been added but not yet started, this can
         * clear enable control and resets all counters in a set.  Therefore,
-        * cpumf_pmu_start() always has to reenable a counter set.
+        * cpumf_pmu_start() always has to re-enable a counter set.
         */
        for (i = CPUMF_CTR_SET_BASIC; i < CPUMF_CTR_SET_MAX; ++i)
                if (!atomic_read(&cpuhw->ctr_set[i]))
@@ -1863,7 +1863,7 @@ static const struct attribute_group *cfdiag_attr_groups[] = {
 /* Performance monitoring unit for event CF_DIAG. Since this event
  * is also started and stopped via the perf_event_open() system call, use
  * the same event enable/disable call back functions. They do not
- * have a pointer to the perf_event strcture as first parameter.
+ * have a pointer to the perf_event structure as first parameter.
  *
  * The functions XXX_add, XXX_del, XXX_start and XXX_stop are also common.
  * Reuse them and distinguish the event (always first parameter) via

diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c
index ffa7739c7a284d8b8f76634c7feb9bbb4bc392a6..a61518b549f00b108693b432a5e57114214a69b8 100644 (file)
--- a/arch/s390/kvm/pci.c
+++ b/arch/s390/kvm/pci.c
@@ -103,7 +103,7 @@ static int zpci_reset_aipb(u8 nisc)
        /*
         * AEN registration can only happen once per system boot.  If
         * an aipb already exists then AEN was already registered and
-        * we can re-use the aipb contents.  This can only happen if
+        * we can reuse the aipb contents.  This can only happen if
         * the KVM module was removed and re-inserted.  However, we must
         * ensure that the same forwarding ISC is used as this is assigned
         * during KVM module load.

diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 2c944bafb0309c653b9c41f6bd4f2ba554beec6b..cea5dba80468cc5854041acb22e250fb33660d50 100644 (file)
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -525,7 +525,7 @@ static inline void pudp_idte_global(struct mm_struct *mm,
        else
                /*
                 * Invalid bit position is the same for pmd and pud, so we can
-                * re-use _pmd_csp() here
+                * reuse _pmd_csp() here
                 */
                __pmdp_csp((pmd_t *) pudp);
 }

diff --git a/arch/s390/purgatory/head.S b/arch/s390/purgatory/head.S
index 0f93f2e72eba0897c932c56a124f2a1b2505faa6..db3ab240262174a29450565db1c670acb7f96eee 100644 (file)
--- a/arch/s390/purgatory/head.S
+++ b/arch/s390/purgatory/head.S
@@ -156,7 +156,7 @@ SYM_CODE_START(purgatory_start)
        agr     %r10,%r9
 
        /* Buffer location (in crash memory) and size. As the purgatory is
-        * behind the point of no return it can re-use the stack as buffer.
+        * behind the point of no return it can reuse the stack as buffer.
         */
        larl    %r11,purgatory_end
        larl    %r12,stack