Commit 927c7927 authored by Ken Cox's avatar Ken Cox Committed by Greg Kroah-Hartman
Browse files

staging: unisys: Give exported symbols unique names 



Many exported symbols had very generic names.  This commit changes the names
so that they will be unique.

Signed-off-by: default avatarKen Cox <jkc@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d776fa4

drivers/staging/unisys/channels/channel.c

+6 −6
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
 * 1 if the insertion succeeds, 0 if the queue was full.

 */

unsigned char

SignalInsert(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal)

visor_signal_insert(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal)

{

	void *psignal;

	unsigned int head, tail;
@@ -78,7 +78,7 @@ SignalInsert(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal) 
	pqhdr->NumSignalsSent++;

	return 1;

}

EXPORT_SYMBOL_GPL(SignalInsert);

EXPORT_SYMBOL_GPL(visor_signal_insert);



/*

 * Routine Description:
@@ -99,7 +99,7 @@ EXPORT_SYMBOL_GPL(SignalInsert); 
 * 1 if the removal succeeds, 0 if the queue was empty.

 */

unsigned char

SignalRemove(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal)

visor_signal_remove(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal)

{

	void *psource;

	unsigned int head, tail;
@@ -131,7 +131,7 @@ SignalRemove(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal) 
	pqhdr->NumSignalsReceived++;

	return 1;

}

EXPORT_SYMBOL_GPL(SignalRemove);

EXPORT_SYMBOL_GPL(visor_signal_remove);



/*

 * Routine Description:
@@ -257,14 +257,14 @@ SignalPeek(pCHANNEL_HEADER pChannel, U32 Queue, U32 Position, void *pSignal) 
 * 1 if the signal queue is empty, 0 otherwise.

 */

unsigned char

SignalQueueIsEmpty(pCHANNEL_HEADER pChannel, U32 Queue)

visor_signalqueue_empty(pCHANNEL_HEADER pChannel, U32 Queue)

{

	pSIGNAL_QUEUE_HEADER pqhdr =

	    (pSIGNAL_QUEUE_HEADER) ((char *) pChannel +

				    pChannel->oChannelSpace) + Queue;

	return pqhdr->Head == pqhdr->Tail;

}

EXPORT_SYMBOL_GPL(SignalQueueIsEmpty);

EXPORT_SYMBOL_GPL(visor_signalqueue_empty);



/*

 * Routine Description:

drivers/staging/unisys/channels/chanstub.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ SignalInsert_withLock(pCHANNEL_HEADER pChannel, U32 Queue, 
	unsigned char result;

	unsigned long flags;

	spin_lock_irqsave(lock, flags);

	result = SignalInsert(pChannel, Queue, pSignal);

	result = visor_signal_insert(pChannel, Queue, pSignal);

	spin_unlock_irqrestore(lock, flags);

	return result;

}
@@ -56,7 +56,7 @@ SignalRemove_withLock(pCHANNEL_HEADER pChannel, U32 Queue, 
{

	unsigned char result;

	spin_lock(lock);

	result = SignalRemove(pChannel, Queue, pSignal);

	result = visor_signal_remove(pChannel, Queue, pSignal);

	spin_unlock(lock);

	return result;

}

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

+6 −4
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ typedef struct _SIGNAL_QUEUE_HEADER { 
	U64 NumInterruptsReceived;	/* Total # of Interrupts received.  This

					 * is incremented by the ISR in the

					 * guest windows driver */

	U64 NumEmptyCnt;	/* Number of times that SignalRemove

	U64 NumEmptyCnt;	/* Number of times that visor_signal_remove

				 * is called and returned Empty

				 * Status. */

	U32 ErrorFlags;		/* Error bits set during SignalReinit
@@ -584,7 +584,8 @@ ULTRA_channel_client_release_os(void *pChannel, U8 *chanId, void *logCtx, 
* full.

*/



unsigned char SignalInsert(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal);

unsigned char visor_signal_insert(pCHANNEL_HEADER pChannel, U32 Queue,

				  void *pSignal);



/*

* Routine Description:
@@ -605,7 +606,8 @@ unsigned char SignalInsert(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal); 
* empty.

*/



unsigned char SignalRemove(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal);

unsigned char visor_signal_remove(pCHANNEL_HEADER pChannel, U32 Queue,

				  void *pSignal);



/*

* Routine Description:
@@ -640,6 +642,6 @@ unsigned int SignalRemoveAll(pCHANNEL_HEADER pChannel, U32 Queue, 
* Return value:

* 1 if the signal queue is empty, 0 otherwise.

*/

unsigned char SignalQueueIsEmpty(pCHANNEL_HEADER pChannel, U32 Queue);

unsigned char visor_signalqueue_empty(pCHANNEL_HEADER pChannel, U32 Queue);



#endif

drivers/staging/unisys/include/periodic_work.h

+9 −9
Original line number Diff line number Diff line
@@ -27,14 +27,14 @@ 
 */

typedef struct PERIODIC_WORK_Tag PERIODIC_WORK;



PERIODIC_WORK *periodic_work_create(ulong jiffy_interval,

PERIODIC_WORK *visor_periodic_work_create(ulong jiffy_interval,

					  struct workqueue_struct *workqueue,

					  void (*workfunc)(void *),

					  void *workfuncarg,

					  const char *devnam);

void            periodic_work_destroy(PERIODIC_WORK *periodic_work);

BOOL            periodic_work_nextperiod(PERIODIC_WORK *periodic_work);

BOOL            periodic_work_start(PERIODIC_WORK *periodic_work);

BOOL            periodic_work_stop(PERIODIC_WORK *periodic_work);

void            visor_periodic_work_destroy(PERIODIC_WORK *periodic_work);

BOOL            visor_periodic_work_nextperiod(PERIODIC_WORK *periodic_work);

BOOL            visor_periodic_work_start(PERIODIC_WORK *periodic_work);

BOOL            visor_periodic_work_stop(PERIODIC_WORK *periodic_work);



#endif

drivers/staging/unisys/include/procobjecttree.h

+9 −9
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ 
typedef struct MYPROCOBJECT_Tag MYPROCOBJECT;

typedef struct MYPROCTYPE_Tag   MYPROCTYPE;



MYPROCOBJECT *proc_CreateObject(MYPROCTYPE *type, const char *name,

MYPROCOBJECT *visor_proc_CreateObject(MYPROCTYPE *type, const char *name,

				      void *context);

void          proc_DestroyObject(MYPROCOBJECT *obj);

MYPROCTYPE   *proc_CreateType(struct proc_dir_entry *procRootDir,

void          visor_proc_DestroyObject(MYPROCOBJECT *obj);

MYPROCTYPE   *visor_proc_CreateType(struct proc_dir_entry *procRootDir,

				    const char **name,

				    const char **propertyNames,

				    void (*show_property)(struct seq_file *,

							  void *, int));

void          proc_DestroyType(MYPROCTYPE *type);

void          visor_proc_DestroyType(MYPROCTYPE *type);



#endif