mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-06 03:06:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: unisys: merge diagchannel.h to visorbus.h

Browse Source 
It is pointless to have a dedicated include for another
include. So I merged them together.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <Timothy.Sell@unisys.com>
Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Erik Arfvidson
2016-09-02 16:41:36 -04:00
committed by Greg Kroah-Hartman
parent 89cb051051
commit e308d698bc
3 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/staging/unisys/include/diagchannel.h
View File

@@ -1,38 +0,0 @@
/* Copyright (C) 2010 - 2013 UNISYS CORPORATION
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
* NON INFRINGEMENT. See the GNU General Public License for more
* details.
*/
#ifndef _DIAG_CHANNEL_H_
#define _DIAG_CHANNEL_H_
/* Levels of severity for diagnostic events, in order from lowest severity to
* highest (i.e. fatal errors are the most severe, and should always be logged,
* but info events rarely need to be logged except during debugging). The
* values DIAG_SEVERITY_ENUM_BEGIN and DIAG_SEVERITY_ENUM_END are not valid
* severity values. They exist merely to dilineate the list, so that future
* additions won't require changes to the driver (i.e. when checking for
* out-of-range severities in SetSeverity). The values DIAG_SEVERITY_OVERRIDE
* and DIAG_SEVERITY_SHUTOFF are not valid severity values for logging events
* but they are valid for controlling the amount of event data. Changes made
* to the enum, need to be reflected in s-Par.
*/
enum diag_severity {
DIAG_SEVERITY_VERBOSE = 0,
DIAG_SEVERITY_INFO = 1,
DIAG_SEVERITY_WARNING = 2,
DIAG_SEVERITY_ERR = 3,
DIAG_SEVERITY_PRINT = 4,
};
#endif

19
drivers/staging/unisys/include/visorbus.h
View File

@@ -187,6 +187,25 @@ int visorbus_write_channel(struct visor_device *dev,
void visorbus_enable_channel_interrupts(struct visor_device *dev);
void visorbus_disable_channel_interrupts(struct visor_device *dev);
/* Levels of severity for diagnostic events, in order from lowest severity to
* highest (i.e. fatal errors are the most severe, and should always be logged,
* but info events rarely need to be logged except during debugging). The
* values DIAG_SEVERITY_ENUM_BEGIN and DIAG_SEVERITY_ENUM_END are not valid
* severity values. They exist merely to dilineate the list, so that future
* additions won't require changes to the driver (i.e. when checking for
* out-of-range severities in SetSeverity). The values DIAG_SEVERITY_OVERRIDE
* and DIAG_SEVERITY_SHUTOFF are not valid severity values for logging events
* but they are valid for controlling the amount of event data. Changes made
* to the enum, need to be reflected in s-Par.
*/
enum diag_severity {
DIAG_SEVERITY_VERBOSE = 0,
DIAG_SEVERITY_INFO = 1,
DIAG_SEVERITY_WARNING = 2,
DIAG_SEVERITY_ERR = 3,
DIAG_SEVERITY_PRINT = 4,
};
bool visorchannel_signalremove(struct visorchannel *channel, u32 queue,
void *msg);
bool visorchannel_signalinsert(struct visorchannel *channel, u32 queue,

1
drivers/staging/unisys/visorbus/vmcallinterface.h
View File

@@ -24,7 +24,6 @@
#ifdef __GNUC__
#include "iovmcall_gnuc.h"
#endif /* */
#include "diagchannel.h"
#ifdef VMCALL_IO_CONTROLVM_ADDR
#undef VMCALL_IO_CONTROLVM_ADDR