diff options
| author | David Kershner <david.kershner@unisys.com> | 2015-06-04 09:22:44 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 13:36:44 -0700 |
| commit | 01ef15f722c65bb747118eee09a5ffa85df934a7 (patch) | |
| tree | 5566f47b07e1e8435042145e8a71e643d0547eb6 /drivers/staging/unisys | |
| parent | 4239f82294398982d31505b89df9664da81671af (diff) | |
| download | linux-01ef15f722c65bb747118eee09a5ffa85df934a7.tar.gz linux-01ef15f722c65bb747118eee09a5ffa85df934a7.tar.bz2 linux-01ef15f722c65bb747118eee09a5ffa85df934a7.zip | |
staging: unisys: Update diag serverity enum
Give the enum the correct values instead of based on other values.
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys')
| -rw-r--r-- | drivers/staging/unisys/include/diagchannel.h | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/drivers/staging/unisys/include/diagchannel.h b/drivers/staging/unisys/include/diagchannel.h index e8fb8678a8e2..c1e74e85ecc8 100644 --- a/drivers/staging/unisys/include/diagchannel.h +++ b/drivers/staging/unisys/include/diagchannel.h @@ -58,20 +58,6 @@ static const uuid_le spar_diag_channel_protocol_uuid = * increment this. */ #define ULTRA_DIAG_CHANNEL_PROTOCOL_VERSIONID 2 -#define SPAR_DIAG_CHANNEL_OK_CLIENT(ch)\ - (spar_check_channel_client(ch,\ - spar_diag_channel_protocol_uuid,\ - "diag",\ - sizeof(struct spar_diag_channel_protocol),\ - ULTRA_DIAG_CHANNEL_PROTOCOL_VERSIONID,\ - ULTRA_DIAG_CHANNEL_PROTOCOL_SIGNATURE)) - -#define SPAR_DIAG_CHANNEL_OK_SERVER(bytes)\ - (spar_check_channel_server(spar_diag_channel_protocol_uuid,\ - "diag",\ - sizeof(struct spar_diag_channel_protocol),\ - bytes)) - #define MAX_MODULE_NAME_SIZE 128 /* Maximum length of module name... */ #define MAX_ADDITIONAL_INFO_SIZE 256 /* Maximum length of any additional info * accompanying event... */ @@ -204,16 +190,16 @@ struct diag_channel_event { * change is made to this enum, they should also be reflected in that file. */ enum diag_severity { DIAG_SEVERITY_ENUM_BEGIN = 0, - DIAG_SEVERITY_OVERRIDE = DIAG_SEVERITY_ENUM_BEGIN, - DIAG_SEVERITY_VERBOSE = DIAG_SEVERITY_OVERRIDE, /* 0 */ - DIAG_SEVERITY_INFO = DIAG_SEVERITY_VERBOSE + 1, /* 1 */ - DIAG_SEVERITY_WARNING = DIAG_SEVERITY_INFO + 1, /* 2 */ - DIAG_SEVERITY_ERR = DIAG_SEVERITY_WARNING + 1, /* 3 */ - DIAG_SEVERITY_PRINT = DIAG_SEVERITY_ERR + 1, /* 4 */ - DIAG_SEVERITY_SHUTOFF = DIAG_SEVERITY_PRINT + 1, /* 5 */ - DIAG_SEVERITY_ENUM_END = DIAG_SEVERITY_SHUTOFF, /* 5 */ - DIAG_SEVERITY_NONFATAL_ERR = DIAG_SEVERITY_ERR, - DIAG_SEVERITY_FATAL_ERR = DIAG_SEVERITY_PRINT + DIAG_SEVERITY_OVERRIDE = 0, + DIAG_SEVERITY_VERBOSE = 0, + DIAG_SEVERITY_INFO = 1, + DIAG_SEVERITY_WARNING = 2, + DIAG_SEVERITY_ERR = 3, + DIAG_SEVERITY_NONFATAL_ERR = 3, + DIAG_SEVERITY_PRINT = 4, + DIAG_SEVERITY_FATAL_ERR = 4, + DIAG_SEVERITY_SHUTOFF = 5, + DIAG_SEVERITY_ENUM_END = 5 }; /* Event Cause enums |