diff options
| author | David Kershner <[email protected]> | 2017-08-22 13:27:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2017-08-22 15:12:52 -0700 |
| commit | 2c1d9820768f80525067fd51f1ae45d5475c0429 (patch) | |
| tree | 727face202afd305224e1e488d43e8fbc5e53147 | |
| parent | 2699f21ab5a24410affa86533043905b23bbee0c (diff) | |
staging: unisys: Move VNIC GUID to visornic
Instead of including it in the global channel.h, move the VNIC GUID to the
visornic module.
Reviewed-by: Sameer Wadgaonkar <[email protected]>
Signed-off-by: David Kershner <[email protected]>
Reviewed-by: Tim Sell <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/unisys/include/channel.h | 6 | ||||
| -rw-r--r-- | drivers/staging/unisys/visornic/visornic_main.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/staging/unisys/include/channel.h b/drivers/staging/unisys/include/channel.h index 01edf795cdfa..8087f19c71c7 100644 --- a/drivers/staging/unisys/include/channel.h +++ b/drivers/staging/unisys/include/channel.h @@ -190,12 +190,6 @@ struct signal_queue_header { 0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f) #define VISOR_VHBA_CHANNEL_GUID_STR \ "414815ed-c58c-11da-95a9-00e08161165f" -/* {8cd5994d-c58e-11da-95a9-00e08161165f} */ -#define VISOR_VNIC_CHANNEL_GUID \ - GUID_INIT(0x8cd5994d, 0xc58e, 0x11da, \ - 0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f) -#define VISOR_VNIC_CHANNEL_GUID_STR \ - "8cd5994d-c58e-11da-95a9-00e08161165f" /* {72120008-4AAB-11DC-8530-444553544200} */ #define VISOR_SIOVM_GUID \ GUID_INIT(0x72120008, 0x4AAB, 0x11DC, \ diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c index 135d37c4c7ed..3db414803f2a 100644 --- a/drivers/staging/unisys/visornic/visornic_main.c +++ b/drivers/staging/unisys/visornic/visornic_main.c @@ -37,6 +37,13 @@ #define NAPI_WEIGHT 64 /* GUIDS for director channel type supported by this driver. */ +/* {8cd5994d-c58e-11da-95a9-00e08161165f} */ +#define VISOR_VNIC_CHANNEL_GUID \ + GUID_INIT(0x8cd5994d, 0xc58e, 0x11da, \ + 0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f) +#define VISOR_VNIC_CHANNEL_GUID_STR \ + "8cd5994d-c58e-11da-95a9-00e08161165f" + static struct visor_channeltype_descriptor visornic_channel_types[] = { /* Note that the only channel type we expect to be reported by the * bus driver is the VISOR_VNIC channel. |