github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 03:53:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Staging: unisys: Fix sparse warnings

Browse Source 
Fix sparse warnings caused by incorrect references to IO space.

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ken Cox 2014-05-22 12:31:09 -05:00 committed by Greg Kroah-Hartman
parent 47a401a8ae
commit 3db5540dfd
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/unisys/uislib/uislib.c
View File

@ -131,7 +131,7 @@ init_msg_header(CONTROLVM_MESSAGE *msg, U32 id, uint rsp, uint svr)
static __iomem void * static __iomem void *
init_vbus_channel(U64 channelAddr, U32 channelBytes, int isServer) init_vbus_channel(U64 channelAddr, U32 channelBytes, int isServer)
{ {
void *rc = NULL; void __iomem *rc = NULL;
void __iomem *pChan = uislib_ioremap_cache(channelAddr, channelBytes); void __iomem *pChan = uislib_ioremap_cache(channelAddr, channelBytes);
if (!pChan) { if (!pChan) {
LOGERR("CONTROLVM_BUS_CREATE error: ioremap_cache of channelAddr:%Lx for channelBytes:%llu failed", LOGERR("CONTROLVM_BUS_CREATE error: ioremap_cache of channelAddr:%Lx for channelBytes:%llu failed",

6
drivers/staging/unisys/visorchannel/visorchannel.h
View File

@ -73,11 +73,11 @@ void visorchannel_debug(VISORCHANNEL *channel, int nQueues,
struct seq_file *seq, U32 off); struct seq_file *seq, U32 off);
void visorchannel_dump_section(VISORCHANNEL *chan, char *s, void visorchannel_dump_section(VISORCHANNEL *chan, char *s,
int off, int len, struct seq_file *seq); 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) \ #define VISORCHANNEL_CHANGE_SERVER_STATE(chan, chanId, newstate) \
do { \ do { \
U8 *p = (U8 *)visorchannel_get_header(chan); \ U8 *p = (U8 __iomem *)visorchannel_get_header(chan); \
if (p) { \ if (p) { \
ULTRA_CHANNEL_SERVER_TRANSITION(p, chanId, SrvState, \ ULTRA_CHANNEL_SERVER_TRANSITION(p, chanId, SrvState, \
newstate, logCtx); \ newstate, logCtx); \
@ -92,7 +92,7 @@ void *visorchannel_get_header(VISORCHANNEL *channel);
#define VISORCHANNEL_CHANGE_CLIENT_STATE(chan, chanId, newstate) \ #define VISORCHANNEL_CHANGE_CLIENT_STATE(chan, chanId, newstate) \
do { \ do { \
U8 *p = (U8 *)visorchannel_get_header(chan); \ U8 *p = (U8 __iomem *)visorchannel_get_header(chan); \
if (p) { \ if (p) { \
ULTRA_CHANNEL_CLIENT_TRANSITION(p, chanId, \ ULTRA_CHANNEL_CLIENT_TRANSITION(p, chanId, \
newstate, logCtx); \ newstate, logCtx); \

4
drivers/staging/unisys/visorchannel/visorchannel_funcs.c
View File

@ -279,10 +279,10 @@ visorchannel_clear(VISORCHANNEL *channel, ulong offset, U8 ch, ulong nbytes)
} }
EXPORT_SYMBOL_GPL(visorchannel_clear); EXPORT_SYMBOL_GPL(visorchannel_clear);
void * void __iomem *
visorchannel_get_header(VISORCHANNEL *channel) visorchannel_get_header(VISORCHANNEL *channel)
{ {
return (void *) &(channel->chan_hdr); return (void __iomem *) &(channel->chan_hdr);
} }
EXPORT_SYMBOL_GPL(visorchannel_get_header); EXPORT_SYMBOL_GPL(visorchannel_get_header);

2
drivers/staging/unisys/visorutil/memregion.h
View File

@ -38,6 +38,6 @@ HOSTADDRESS visor_memregion_get_physaddr(MEMREGION *memregion);
ulong visor_memregion_get_nbytes(MEMREGION *memregion); ulong visor_memregion_get_nbytes(MEMREGION *memregion);
void memregion_dump(MEMREGION *memregion, char *s, void memregion_dump(MEMREGION *memregion, char *s,
ulong off, ulong len, struct seq_file *seq); ulong off, ulong len, struct seq_file *seq);
void *visor_memregion_get_pointer(MEMREGION *memregion); void __iomem *visor_memregion_get_pointer(MEMREGION *memregion);
#endif #endif

6
drivers/staging/unisys/visorutil/memregion_direct.c
View File

@ -29,7 +29,7 @@
struct MEMREGION_Tag { struct MEMREGION_Tag {
HOSTADDRESS physaddr; HOSTADDRESS physaddr;
ulong nbytes; ulong nbytes;
void *mapped; void __iomem *mapped;
BOOL requested; BOOL requested;
BOOL overlapped; BOOL overlapped;
}; };
@ -93,7 +93,7 @@ visor_memregion_create_overlapped(MEMREGION *parent, ulong offset, ulong nbytes)
memregion->physaddr = parent->physaddr + offset; memregion->physaddr = parent->physaddr + offset;
memregion->nbytes = nbytes; memregion->nbytes = nbytes;
memregion->mapped = ((u8 *) (parent->mapped)) + offset; memregion->mapped = ((u8 __iomem *) (parent->mapped)) + offset;
memregion->requested = FALSE; memregion->requested = FALSE;
memregion->overlapped = TRUE; memregion->overlapped = TRUE;
return memregion; return memregion;
@ -149,7 +149,7 @@ visor_memregion_get_nbytes(MEMREGION *memregion)
} }
EXPORT_SYMBOL_GPL(visor_memregion_get_nbytes); EXPORT_SYMBOL_GPL(visor_memregion_get_nbytes);
void * void __iomem *
visor_memregion_get_pointer(MEMREGION *memregion) visor_memregion_get_pointer(MEMREGION *memregion)
{ {
return memregion->mapped; return memregion->mapped;