Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3db5540d authored by Ken Cox's avatar Ken Cox Committed by Greg Kroah-Hartman
Browse files

Staging: unisys: Fix sparse warnings 



Fix sparse warnings caused by incorrect references to IO space.

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

drivers/staging/unisys/uislib/uislib.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ init_msg_header(CONTROLVM_MESSAGE *msg, U32 id, uint rsp, uint svr) 
static __iomem void *

init_vbus_channel(U64 channelAddr, U32 channelBytes, int isServer)

{

	void *rc = NULL;

	void __iomem *rc = NULL;

	void __iomem *pChan = uislib_ioremap_cache(channelAddr, channelBytes);

	if (!pChan) {

		LOGERR("CONTROLVM_BUS_CREATE error: ioremap_cache of channelAddr:%Lx for channelBytes:%llu failed",

drivers/staging/unisys/visorchannel/visorchannel.h

+3 −3
Original line number Diff line number Diff line
@@ -73,11 +73,11 @@ void visorchannel_debug(VISORCHANNEL *channel, int nQueues, 
			struct seq_file *seq, U32 off);

void visorchannel_dump_section(VISORCHANNEL *chan, char *s,

			       int off, int len, struct seq_file *seq);

void *visorchannel_get_header(VISORCHANNEL *channel);

void __iomem *visorchannel_get_header(VISORCHANNEL *channel);



#define	VISORCHANNEL_CHANGE_SERVER_STATE(chan, chanId, newstate)	\

	do {								\

		U8 *p = (U8 *)visorchannel_get_header(chan);		\

		U8 *p = (U8 __iomem *)visorchannel_get_header(chan);	\

		if (p) {						\

			ULTRA_CHANNEL_SERVER_TRANSITION(p, chanId, SrvState, \

							newstate, logCtx); \
@@ -92,7 +92,7 @@ void *visorchannel_get_header(VISORCHANNEL *channel); 


#define	VISORCHANNEL_CHANGE_CLIENT_STATE(chan, chanId, newstate)	\

	do {								\

		U8 *p = (U8 *)visorchannel_get_header(chan);		\

		U8 *p = (U8 __iomem *)visorchannel_get_header(chan);	\

		if (p) {						\

			ULTRA_CHANNEL_CLIENT_TRANSITION(p, chanId,	\

							newstate, logCtx); \

drivers/staging/unisys/visorchannel/visorchannel_funcs.c

+2 −2
Original line number Diff line number Diff line
@@ -279,10 +279,10 @@ visorchannel_clear(VISORCHANNEL *channel, ulong offset, U8 ch, ulong nbytes) 
}

EXPORT_SYMBOL_GPL(visorchannel_clear);



void *

void __iomem  *

visorchannel_get_header(VISORCHANNEL *channel)

{

	return (void *) &(channel->chan_hdr);

	return (void __iomem *) &(channel->chan_hdr);

}

EXPORT_SYMBOL_GPL(visorchannel_get_header);

drivers/staging/unisys/visorutil/memregion.h

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ HOSTADDRESS visor_memregion_get_physaddr(MEMREGION *memregion); 
ulong visor_memregion_get_nbytes(MEMREGION *memregion);

void memregion_dump(MEMREGION *memregion, char *s,

		    ulong off, ulong len, struct seq_file *seq);

void *visor_memregion_get_pointer(MEMREGION *memregion);

void __iomem *visor_memregion_get_pointer(MEMREGION *memregion);



#endif

drivers/staging/unisys/visorutil/memregion_direct.c

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
struct MEMREGION_Tag {

	HOSTADDRESS physaddr;

	ulong nbytes;

	void *mapped;

	void __iomem *mapped;

	BOOL requested;

	BOOL overlapped;

};
@@ -93,7 +93,7 @@ visor_memregion_create_overlapped(MEMREGION *parent, ulong offset, ulong nbytes) 


	memregion->physaddr = parent->physaddr + offset;

	memregion->nbytes = nbytes;

	memregion->mapped = ((u8 *) (parent->mapped)) + offset;

	memregion->mapped = ((u8 __iomem *) (parent->mapped)) + offset;

	memregion->requested = FALSE;

	memregion->overlapped = TRUE;

	return memregion;
@@ -149,7 +149,7 @@ visor_memregion_get_nbytes(MEMREGION *memregion) 
}

EXPORT_SYMBOL_GPL(visor_memregion_get_nbytes);



void *

void __iomem *

visor_memregion_get_pointer(MEMREGION *memregion)

{

	return memregion->mapped;