diff options
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/block/dasd_3990_erp.c | 4 | ||||
-rw-r--r-- | drivers/s390/char/sclp_cpi.c | 2 | ||||
-rw-r--r-- | drivers/s390/cio/cmf.c | 2 | ||||
-rw-r--r-- | drivers/s390/net/ctcmain.c | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index 8b9d68f6e016..5b7385e430ea 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c | |||
@@ -40,7 +40,7 @@ struct DCTL_data { | |||
40 | * | 40 | * |
41 | * Each bit configuration leading to an action code 2 (Exit with | 41 | * Each bit configuration leading to an action code 2 (Exit with |
42 | * programming error or unusual condition indication) | 42 | * programming error or unusual condition indication) |
43 | * are handled as fatal error´s. | 43 | * are handled as fatal errors. |
44 | * | 44 | * |
45 | * All other configurations are handled as recoverable errors. | 45 | * All other configurations are handled as recoverable errors. |
46 | * | 46 | * |
@@ -2001,7 +2001,7 @@ dasd_3990_erp_compound_code(struct dasd_ccw_req * erp, char *sense) | |||
2001 | switch (sense[28]) { | 2001 | switch (sense[28]) { |
2002 | case 0x17: | 2002 | case 0x17: |
2003 | /* issue a Diagnostic Control command with an | 2003 | /* issue a Diagnostic Control command with an |
2004 | * Inhibit Write subcommand and controler modifier */ | 2004 | * Inhibit Write subcommand and controller modifier */ |
2005 | erp = dasd_3990_erp_DCTL(erp, 0x20); | 2005 | erp = dasd_3990_erp_DCTL(erp, 0x20); |
2006 | break; | 2006 | break; |
2007 | 2007 | ||
diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c index 29fe2a5ec2fe..82a13d9fdfe4 100644 --- a/drivers/s390/char/sclp_cpi.c +++ b/drivers/s390/char/sclp_cpi.c | |||
@@ -157,7 +157,7 @@ cpi_prepare_req(void) | |||
157 | sclp_ascebc_str(evb->system_name, CPI_LENGTH_SYSTEM_NAME); | 157 | sclp_ascebc_str(evb->system_name, CPI_LENGTH_SYSTEM_NAME); |
158 | EBC_TOUPPER(evb->system_name, CPI_LENGTH_SYSTEM_NAME); | 158 | EBC_TOUPPER(evb->system_name, CPI_LENGTH_SYSTEM_NAME); |
159 | 159 | ||
160 | /* set sytem level */ | 160 | /* set system level */ |
161 | evb->system_level = LINUX_VERSION_CODE; | 161 | evb->system_level = LINUX_VERSION_CODE; |
162 | 162 | ||
163 | /* set sysplex name */ | 163 | /* set sysplex name */ |
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c index b960f66843e4..725b0dd14269 100644 --- a/drivers/s390/cio/cmf.c +++ b/drivers/s390/cio/cmf.c | |||
@@ -158,7 +158,7 @@ static inline u64 time_to_avg_nsec(u32 value, u32 count) | |||
158 | if (count == 0) | 158 | if (count == 0) |
159 | return 0; | 159 | return 0; |
160 | 160 | ||
161 | /* value comes in units of 128 µsec */ | 161 | /* value comes in units of 128 µsec */ |
162 | ret = time_to_nsec(value); | 162 | ret = time_to_nsec(value); |
163 | do_div(ret, count); | 163 | do_div(ret, count); |
164 | 164 | ||
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c index 449937233732..6bf3ebbe985a 100644 --- a/drivers/s390/net/ctcmain.c +++ b/drivers/s390/net/ctcmain.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation | 4 | * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation |
5 | * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com) | 5 | * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com) |
6 | * Fixes by : Jochen Röhrig (roehrig@de.ibm.com) | 6 | * Fixes by : Jochen Röhrig (roehrig@de.ibm.com) |
7 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 7 | * Arnaldo Carvalho de Melo <acme@conectiva.com.br> |
8 | Peter Tiedemann (ptiedem@de.ibm.com) | 8 | Peter Tiedemann (ptiedem@de.ibm.com) |
9 | * Driver Model stuff by : Cornelia Huck <cornelia.huck@de.ibm.com> | 9 | * Driver Model stuff by : Cornelia Huck <cornelia.huck@de.ibm.com> |
@@ -19,7 +19,7 @@ | |||
19 | * Dieter Wellerdiek (wel@de.ibm.com) | 19 | * Dieter Wellerdiek (wel@de.ibm.com) |
20 | * Martin Schwidefsky (schwidefsky@de.ibm.com) | 20 | * Martin Schwidefsky (schwidefsky@de.ibm.com) |
21 | * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) | 21 | * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) |
22 | * Jochen Röhrig (roehrig@de.ibm.com) | 22 | * Jochen Röhrig (roehrig@de.ibm.com) |
23 | * | 23 | * |
24 | * This program is free software; you can redistribute it and/or modify | 24 | * This program is free software; you can redistribute it and/or modify |
25 | * it under the terms of the GNU General Public License as published by | 25 | * it under the terms of the GNU General Public License as published by |
@@ -885,7 +885,7 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg) | |||
885 | } | 885 | } |
886 | 886 | ||
887 | /** | 887 | /** |
888 | * Don´t setup a timer for receiving the initial RX frame | 888 | * Don't setup a timer for receiving the initial RX frame |
889 | * if in compatibility mode, since VM TCP delays the initial | 889 | * if in compatibility mode, since VM TCP delays the initial |
890 | * frame until it has some data to send. | 890 | * frame until it has some data to send. |
891 | */ | 891 | */ |
@@ -905,10 +905,10 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg) | |||
905 | ccw_check_return_code(ch, rc, "init IO"); | 905 | ccw_check_return_code(ch, rc, "init IO"); |
906 | } | 906 | } |
907 | /** | 907 | /** |
908 | * If in compatibility mode since we don´t setup a timer, we | 908 | * If in compatibility mode since we don't setup a timer, we |
909 | * also signal RX channel up immediately. This enables us | 909 | * also signal RX channel up immediately. This enables us |
910 | * to send packets early which in turn usually triggers some | 910 | * to send packets early which in turn usually triggers some |
911 | * reply from VM TCP which brings up the RX channel to it´s | 911 | * reply from VM TCP which brings up the RX channel to it's |
912 | * final state. | 912 | * final state. |
913 | */ | 913 | */ |
914 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && | 914 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && |