AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: unisys: fix up ULTRA_CHANNEL_CLIENT_TRANSITION macro

Browse Source 
Rename the macro to SPAR_CHANNEL_CLIENT_TRANSITION, and fix CamelCase
parameters:

pChan => ch
chanId => id
logCtx => log

Update all places the macro was used to call the new name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Benjamin Romer 2014-10-23 14:30:00 -04:00 committed by Greg Kroah-Hartman
parent 8800bfbc06
commit ff97a3fdf5
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/unisys/common-spar/include/channels/channel.h
View File

@ -128,26 +128,24 @@ ULTRA_CHANNELCLI_STRING(u32 v)
line); \
} while (0)
#define ULTRA_CHANNEL_CLIENT_TRANSITION(pChan, chanId, \
newstate, logCtx) \
#define SPAR_CHANNEL_CLIENT_TRANSITION(ch, id, newstate, log) \
do { \
SPAR_CHANNEL_CLIENT_CHK_TRANSITION( \
readl(&(((struct channel_header __iomem *) \
(pChan))->cli_state_os)), \
newstate, \
chanId, logCtx, __FILE__, __LINE__); \
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", \
chanId, "CliStateOS", \
id, "CliStateOS", \
ULTRA_CHANNELCLI_STRING( \
readl(&((struct channel_header __iomem *)\
(pChan))->cli_state_os)), \
readl(&((struct channel_header __iomem *) \
(pChan))->cli_state_os), \
(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 *) \
(pChan))->cli_state_os); \
writel(newstate, &((struct channel_header __iomem *)\
(ch))->cli_state_os); \
mb(); /* required for channel synch */ \
} while (0)

6
drivers/staging/unisys/virthba/virthba.c
View File

@ -1498,9 +1498,9 @@ virthba_serverup(struct virtpci_dev *virtpcidev)
/* Must transition channel to ATTACHED state BEFORE we
* can start using the device again
*/
ULTRA_CHANNEL_CLIENT_TRANSITION(virthbainfo->chinfo.queueinfo->chan,
dev_name(&virtpcidev->generic_dev),
CHANNELCLI_ATTACHED, NULL);
SPAR_CHANNEL_CLIENT_TRANSITION(virthbainfo->chinfo.queueinfo->chan,
dev_name(&virtpcidev->generic_dev),
CHANNELCLI_ATTACHED, NULL);
/* Start Processing the IOVM Response Queue Again */
if (!uisthread_start(&virthbainfo->chinfo.threadinfo,

12
drivers/staging/unisys/virtpci/virtpci.c
View File

@ -1009,9 +1009,9 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
* queues can begin at any time after device_register().
*/
pDev = &virtpcidev->generic_dev;
ULTRA_CHANNEL_CLIENT_TRANSITION(addparams->chanptr,
BUS_ID(pDev),
CHANNELCLI_ATTACHED, NULL);
SPAR_CHANNEL_CLIENT_TRANSITION(addparams->chanptr,
BUS_ID(pDev),
CHANNELCLI_ATTACHED, NULL);
/* don't register until device has been added to
* list. Otherwise, a device_unregister from this function can
@ -1032,9 +1032,9 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
if (ret) {
LOGERR("device_register returned %d\n", ret);
pDev = &virtpcidev->generic_dev;
ULTRA_CHANNEL_CLIENT_TRANSITION(addparams->chanptr,
BUS_ID(pDev),
CHANNELCLI_DETACHED, NULL);
SPAR_CHANNEL_CLIENT_TRANSITION(addparams->chanptr,
BUS_ID(pDev),
CHANNELCLI_DETACHED, NULL);
/* remove virtpcidev, the one we just added, from the list */
write_lock_irqsave(&VpcidevListLock, flags);
for (tmpvpcidev = VpcidevListHead, prev = NULL;