Commit 960e0a5f authored by Ken Cox's avatar Ken Cox Committed by Greg Kroah-Hartman

Staging: unisys: use Linux coding convention for function names

Change function names to conform to Linux kernel coding convention.
    ULTRA_VBUS_init_channel() --> ultra_vbus_init_channel()
    VBUSCHANNEL_devInfoToStringBuffer() --> vbuschannel_devinfo_to_string()
    VBUSCHANNEL_sanitize_buffer() --> vbuschannel_sanitize_buffer()
    VBUSCHANNEL_itoa() --> vbuschannel_itoa()
Signed-off-by: default avatarKen Cox <jkc@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55afa336
...@@ -94,8 +94,8 @@ typedef struct _ULTRA_VBUS_CHANNEL_PROTOCOL { ...@@ -94,8 +94,8 @@ typedef struct _ULTRA_VBUS_CHANNEL_PROTOCOL {
sizeof(ULTRA_VBUS_DEVICEINFO))) sizeof(ULTRA_VBUS_DEVICEINFO)))
#define VBUS_CH_SIZE(MAXDEVICES) COVER(VBUS_CH_SIZE_EXACT(MAXDEVICES), 4096) #define VBUS_CH_SIZE(MAXDEVICES) COVER(VBUS_CH_SIZE_EXACT(MAXDEVICES), 4096)
static INLINE void static inline void
ULTRA_VBUS_init_channel(ULTRA_VBUS_CHANNEL_PROTOCOL __iomem *x, ultra_vbus_init_channel(ULTRA_VBUS_CHANNEL_PROTOCOL __iomem *x,
int bytesAllocated) int bytesAllocated)
{ {
/* Please note that the memory at <x> does NOT necessarily have space /* Please note that the memory at <x> does NOT necessarily have space
......
...@@ -50,7 +50,7 @@ typedef struct _ULTRA_VBUS_DEVICEINFO { ...@@ -50,7 +50,7 @@ typedef struct _ULTRA_VBUS_DEVICEINFO {
* to a buffer at <p>, had it been infinitely big. * to a buffer at <p>, had it been infinitely big.
*/ */
static inline int static inline int
VBUSCHANNEL_sanitize_buffer(char *p, int remain, char __iomem *src, int srcmax) vbuschannel_sanitize_buffer(char *p, int remain, char __iomem *src, int srcmax)
{ {
int chars = 0; int chars = 0;
int nonprintable_streak = 0; int nonprintable_streak = 0;
...@@ -99,7 +99,7 @@ VBUSCHANNEL_sanitize_buffer(char *p, int remain, char __iomem *src, int srcmax) ...@@ -99,7 +99,7 @@ VBUSCHANNEL_sanitize_buffer(char *p, int remain, char __iomem *src, int srcmax)
* an environment-independent way (since we are in a common header file). * an environment-independent way (since we are in a common header file).
*/ */
static inline int static inline int
VBUSCHANNEL_itoa(char *p, int remain, int num) vbuschannel_itoa(char *p, int remain, int num)
{ {
int digits = 0; int digits = 0;
char s[32]; char s[32];
...@@ -146,22 +146,22 @@ VBUSCHANNEL_itoa(char *p, int remain, int num) ...@@ -146,22 +146,22 @@ VBUSCHANNEL_itoa(char *p, int remain, int num)
* Returns the number of bytes written to <p>. * Returns the number of bytes written to <p>.
*/ */
static inline int static inline int
VBUSCHANNEL_devInfoToStringBuffer(ULTRA_VBUS_DEVICEINFO __iomem *devInfo, vbuschannel_devinfo_to_string(ULTRA_VBUS_DEVICEINFO __iomem *devinfo,
char *p, int remain, int devix) char *p, int remain, int devix)
{ {
char __iomem *psrc; char __iomem *psrc;
int nsrc, x, i, pad; int nsrc, x, i, pad;
int chars = 0; int chars = 0;
psrc = &(devInfo->devType[0]); psrc = &(devinfo->devType[0]);
nsrc = sizeof(devInfo->devType); nsrc = sizeof(devinfo->devType);
if (VBUSCHANNEL_sanitize_buffer(NULL, 0, psrc, nsrc) <= 0) if (vbuschannel_sanitize_buffer(NULL, 0, psrc, nsrc) <= 0)
return 0; return 0;
/* emit device index */ /* emit device index */
if (devix >= 0) { if (devix >= 0) {
VBUSCHANNEL_ADDACHAR('[', p, remain, chars); VBUSCHANNEL_ADDACHAR('[', p, remain, chars);
x = VBUSCHANNEL_itoa(p, remain, devix); x = vbuschannel_itoa(p, remain, devix);
p += x; p += x;
remain -= x; remain -= x;
chars += x; chars += x;
...@@ -173,7 +173,7 @@ VBUSCHANNEL_devInfoToStringBuffer(ULTRA_VBUS_DEVICEINFO __iomem *devInfo, ...@@ -173,7 +173,7 @@ VBUSCHANNEL_devInfoToStringBuffer(ULTRA_VBUS_DEVICEINFO __iomem *devInfo,
} }
/* emit device type */ /* emit device type */
x = VBUSCHANNEL_sanitize_buffer(p, remain, psrc, nsrc); x = vbuschannel_sanitize_buffer(p, remain, psrc, nsrc);
p += x; p += x;
remain -= x; remain -= x;
chars += x; chars += x;
...@@ -183,9 +183,9 @@ VBUSCHANNEL_devInfoToStringBuffer(ULTRA_VBUS_DEVICEINFO __iomem *devInfo, ...@@ -183,9 +183,9 @@ VBUSCHANNEL_devInfoToStringBuffer(ULTRA_VBUS_DEVICEINFO __iomem *devInfo,
VBUSCHANNEL_ADDACHAR(' ', p, remain, chars); VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);
/* emit driver name */ /* emit driver name */
psrc = &(devInfo->drvName[0]); psrc = &(devinfo->drvName[0]);
nsrc = sizeof(devInfo->drvName); nsrc = sizeof(devinfo->drvName);
x = VBUSCHANNEL_sanitize_buffer(p, remain, psrc, nsrc); x = vbuschannel_sanitize_buffer(p, remain, psrc, nsrc);
p += x; p += x;
remain -= x; remain -= x;
chars += x; chars += x;
...@@ -195,9 +195,9 @@ VBUSCHANNEL_devInfoToStringBuffer(ULTRA_VBUS_DEVICEINFO __iomem *devInfo, ...@@ -195,9 +195,9 @@ VBUSCHANNEL_devInfoToStringBuffer(ULTRA_VBUS_DEVICEINFO __iomem *devInfo,
VBUSCHANNEL_ADDACHAR(' ', p, remain, chars); VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);
/* emit strings */ /* emit strings */
psrc = &(devInfo->infoStrings[0]); psrc = &(devinfo->infoStrings[0]);
nsrc = sizeof(devInfo->infoStrings); nsrc = sizeof(devinfo->infoStrings);
x = VBUSCHANNEL_sanitize_buffer(p, remain, psrc, nsrc); x = vbuschannel_sanitize_buffer(p, remain, psrc, nsrc);
p += x; p += x;
remain -= x; remain -= x;
chars += x; chars += x;
......
...@@ -148,7 +148,7 @@ init_vbus_channel(U64 channelAddr, U32 channelBytes, int isServer) ...@@ -148,7 +148,7 @@ init_vbus_channel(U64 channelAddr, U32 channelBytes, int isServer)
rc = NULL; rc = NULL;
goto Away; goto Away;
} }
ULTRA_VBUS_init_channel(pChan, channelBytes); ultra_vbus_init_channel(pChan, channelBytes);
} else { } else {
if (!ULTRA_VBUS_CHANNEL_OK_CLIENT(pChan, NULL)) { if (!ULTRA_VBUS_CHANNEL_OK_CLIENT(pChan, NULL)) {
ERRDRV("%s channel cannot be used", __func__); ERRDRV("%s channel cannot be used", __func__);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment