From 63b0179c397b70029dc28d166211354697fb1382 Mon Sep 17 00:00:00 2001 From: David Kershner Date: Wed, 13 May 2015 13:22:04 -0400 Subject: [PATCH] staging: unisys: Move channel.h to include. Controvlm to visorbus Channel.h is used by all channels, it needs to be in include. Controlvm Channel is only used by visorbus, it needs to just be there. Signed-off-by: David Kershner Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .../include/channels => include}/channel.h | 35 ------------------- .../channels => include}/channel_guid.h | 0 .../channels => visorbus}/controlvmchannel.h | 0 3 files changed, 35 deletions(-) rename drivers/staging/unisys/{common-spar/include/channels => include}/channel.h (94%) rename drivers/staging/unisys/{common-spar/include/channels => include}/channel_guid.h (100%) rename drivers/staging/unisys/{common-spar/include/channels => visorbus}/controlvmchannel.h (100%) diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/include/channel.h similarity index 94% rename from drivers/staging/unisys/common-spar/include/channels/channel.h rename to drivers/staging/unisys/include/channel.h index 6fb6e5b3ddaf..da0b5387f884 100644 --- a/drivers/staging/unisys/common-spar/include/channels/channel.h +++ b/drivers/staging/unisys/include/channel.h @@ -114,41 +114,6 @@ ULTRA_CHANNELCLI_STRING(u32 v) (((o) == CHANNELCLI_BUSY) && ((n) == CHANNELCLI_OWNED)) || (0)) \ ? (1) : (0)) -#define SPAR_CHANNEL_CLIENT_CHK_TRANSITION(old, new, id, log, \ - file, line) \ - do { \ - if (!ULTRA_VALID_CHANNELCLI_TRANSITION(old, new)) \ - pr_info("%s Channel StateTransition INVALID! (%s) %s(%d)-->%s(%d) @%s:%d\n", \ - id, "CliState", \ - ULTRA_CHANNELCLI_STRING(old), \ - old, \ - ULTRA_CHANNELCLI_STRING(new), \ - new, \ - pathname_last_n_nodes((u8 *)file, 4), \ - line); \ - } while (0) - -#define SPAR_CHANNEL_CLIENT_TRANSITION(ch, id, newstate, log) \ - do { \ - SPAR_CHANNEL_CLIENT_CHK_TRANSITION( \ - readl(&(((struct channel_header __iomem *)\ - (ch))->cli_state_os)), \ - newstate, id, log, __FILE__, __LINE__); \ - pr_info("%s Channel StateTransition (%s) %s(%d)-->%s(%d) @%s:%d\n", \ - id, "CliStateOS", \ - ULTRA_CHANNELCLI_STRING( \ - readl(&((struct channel_header __iomem *)\ - (ch))->cli_state_os)), \ - readl(&((struct channel_header __iomem *)\ - (ch))->cli_state_os), \ - ULTRA_CHANNELCLI_STRING(newstate), \ - newstate, \ - pathname_last_n_nodes(__FILE__, 4), __LINE__); \ - writel(newstate, &((struct channel_header __iomem *)\ - (ch))->cli_state_os); \ - mb(); /* required for channel synch */ \ - } while (0) - /* Values for ULTRA_CHANNEL_PROTOCOL.CliErrorBoot: */ /* throttling invalid boot channel statetransition error due to client * disabled */ diff --git a/drivers/staging/unisys/common-spar/include/channels/channel_guid.h b/drivers/staging/unisys/include/channel_guid.h similarity index 100% rename from drivers/staging/unisys/common-spar/include/channels/channel_guid.h rename to drivers/staging/unisys/include/channel_guid.h diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/visorbus/controlvmchannel.h similarity index 100% rename from drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h rename to drivers/staging/unisys/visorbus/controlvmchannel.h -- 2.39.5