Commit d6d0c6f4 authored by David Binder's avatar David Binder Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorbus: Merge channel_guid.h with channel.h 



Merges the contents of channel_guid.h with channel.h, as the former was
not a proper header file. Therefore, the channel_guid.h is no longer
needed.

Signed-off-by: default avatarDavid Binder <david.binder@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarTim Sell <Timothy.Sell@unisys.com>
Reported-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7339cb09

drivers/staging/unisys/include/channel.h

+41 −0
Original line number Diff line number Diff line
@@ -569,4 +569,45 @@ unsigned int spar_signal_remove_all(struct channel_header *ch, u32 queue, 
unsigned char spar_signalqueue_empty(struct channel_header __iomem *ch,

				     u32 queue);



/*

 * CHANNEL Guids

 */



/* {414815ed-c58c-11da-95a9-00e08161165f} */

#define SPAR_VHBA_CHANNEL_PROTOCOL_UUID \

		UUID_LE(0x414815ed, 0xc58c, 0x11da, \

				0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)

static const uuid_le spar_vhba_channel_protocol_uuid =

	SPAR_VHBA_CHANNEL_PROTOCOL_UUID;

#define SPAR_VHBA_CHANNEL_PROTOCOL_UUID_STR \

	"414815ed-c58c-11da-95a9-00e08161165f"



/* {8cd5994d-c58e-11da-95a9-00e08161165f} */

#define SPAR_VNIC_CHANNEL_PROTOCOL_UUID \

		UUID_LE(0x8cd5994d, 0xc58e, 0x11da, \

				0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)

static const uuid_le spar_vnic_channel_protocol_uuid =

	SPAR_VNIC_CHANNEL_PROTOCOL_UUID;

#define SPAR_VNIC_CHANNEL_PROTOCOL_UUID_STR \

	"8cd5994d-c58e-11da-95a9-00e08161165f"



/* {72120008-4AAB-11DC-8530-444553544200} */

#define SPAR_SIOVM_UUID \

		UUID_LE(0x72120008, 0x4AAB, 0x11DC, \

				0x85, 0x30, 0x44, 0x45, 0x53, 0x54, 0x42, 0x00)

static const uuid_le spar_siovm_uuid = SPAR_SIOVM_UUID;



/* {5b52c5ac-e5f5-4d42-8dff-429eaecd221f} */

#define SPAR_CONTROLDIRECTOR_CHANNEL_PROTOCOL_UUID  \

		UUID_LE(0x5b52c5ac, 0xe5f5, 0x4d42, \

				0x8d, 0xff, 0x42, 0x9e, 0xae, 0xcd, 0x22, 0x1f)



static const uuid_le spar_controldirector_channel_protocol_uuid =

	SPAR_CONTROLDIRECTOR_CHANNEL_PROTOCOL_UUID;



/* {b4e79625-aede-4eAA-9e11-D3eddcd4504c} */

#define SPAR_DIAG_POOL_CHANNEL_PROTOCOL_UUID				\

		UUID_LE(0xb4e79625, 0xaede, 0x4eaa, \

				0x9e, 0x11, 0xd3, 0xed, 0xdc, 0xd4, 0x50, 0x4c)



#endif

drivers/staging/unisys/include/channel_guid.h

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/* 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.

 */



/*

 * CHANNEL Guids

 */



/* {414815ed-c58c-11da-95a9-00e08161165f} */

#define SPAR_VHBA_CHANNEL_PROTOCOL_UUID \

		UUID_LE(0x414815ed, 0xc58c, 0x11da, \

				0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)

static const uuid_le spar_vhba_channel_protocol_uuid =

	SPAR_VHBA_CHANNEL_PROTOCOL_UUID;

#define SPAR_VHBA_CHANNEL_PROTOCOL_UUID_STR \

	"414815ed-c58c-11da-95a9-00e08161165f"



/* {8cd5994d-c58e-11da-95a9-00e08161165f} */

#define SPAR_VNIC_CHANNEL_PROTOCOL_UUID \

		UUID_LE(0x8cd5994d, 0xc58e, 0x11da, \

				0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)

static const uuid_le spar_vnic_channel_protocol_uuid =

	SPAR_VNIC_CHANNEL_PROTOCOL_UUID;

#define SPAR_VNIC_CHANNEL_PROTOCOL_UUID_STR \

	"8cd5994d-c58e-11da-95a9-00e08161165f"



/* {72120008-4AAB-11DC-8530-444553544200} */

#define SPAR_SIOVM_UUID \

		UUID_LE(0x72120008, 0x4AAB, 0x11DC, \

				0x85, 0x30, 0x44, 0x45, 0x53, 0x54, 0x42, 0x00)

static const uuid_le spar_siovm_uuid = SPAR_SIOVM_UUID;



/* {5b52c5ac-e5f5-4d42-8dff-429eaecd221f} */

#define SPAR_CONTROLDIRECTOR_CHANNEL_PROTOCOL_UUID  \

		UUID_LE(0x5b52c5ac, 0xe5f5, 0x4d42, \

				0x8d, 0xff, 0x42, 0x9e, 0xae, 0xcd, 0x22, 0x1f)



static const uuid_le spar_controldirector_channel_protocol_uuid =

	SPAR_CONTROLDIRECTOR_CHANNEL_PROTOCOL_UUID;



/* {b4e79625-aede-4eAA-9e11-D3eddcd4504c} */

#define SPAR_DIAG_POOL_CHANNEL_PROTOCOL_UUID				\

		UUID_LE(0xb4e79625, 0xaede, 0x4eaa, \

				0x9e, 0x11, 0xd3, 0xed, 0xdc, 0xd4, 0x50, 0x4c)

drivers/staging/unisys/include/iochannel.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


#include <linux/dma-direction.h>

#include "channel.h"

#include "channel_guid.h"



#define ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE

#define ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE

drivers/staging/unisys/visorbus/visorchipset.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/uuid.h>

#include <linux/crash_dump.h>



#include "channel_guid.h"

#include "channel.h"

#include "controlvmchannel.h"

#include "controlvmcompletionstatus.h"

#include "guestlinuxdebug.h"