evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: unisys: visorchipset: Get rid of ulong usage

Browse source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Tested-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2015-04-13 10:28:44 -04:00 • committed by Greg Kroah-Hartman
parent ac48c05c67
commit 1d4c1afac4
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/unisys/visorchipset/file.c
View file

@ -60,8 +60,8 @@ visorchipset_release(struct inode *inode, struct file *file)
static int static int
visorchipset_mmap(struct file *file, struct vm_area_struct *vma) visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
{ {
ulong physaddr = 0; unsigned long physaddr = 0;
ulong offset = vma->vm_pgoff << PAGE_SHIFT; unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
GUEST_PHYSICAL_ADDRESS addr = 0; GUEST_PHYSICAL_ADDRESS addr = 0;
/* sv_enable_dfp(); */ /* sv_enable_dfp(); */
@ -81,7 +81,7 @@ visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
if (addr == 0) { if (addr == 0) {
return -ENXIO; return -ENXIO;
} }
physaddr = (ulong)addr; physaddr = (unsigned long)addr;
if (remap_pfn_range(vma, vma->vm_start, if (remap_pfn_range(vma, vma->vm_start,
physaddr >> PAGE_SHIFT, physaddr >> PAGE_SHIFT,
vma->vm_end - vma->vm_start, vma->vm_end - vma->vm_start,

16
drivers/staging/unisys/visorchipset/parser.c
View file

@ -29,13 +29,13 @@
* incoming payloads. This serves as a throttling mechanism. * incoming payloads. This serves as a throttling mechanism.
*/ */
#define MAX_CONTROLVM_PAYLOAD_BYTES (1024*128) #define MAX_CONTROLVM_PAYLOAD_BYTES (1024*128)
static ulong controlvm_payload_bytes_buffered; static unsigned long controlvm_payload_bytes_buffered;
struct parser_context { struct parser_context {
ulong allocbytes; unsigned long allocbytes;
ulong param_bytes; unsigned long param_bytes;
u8 *curr; u8 *curr;
ulong bytes_remaining; unsigned long bytes_remaining;
bool byte_stream; bool byte_stream;
char data[0]; char data[0];
}; };
@ -84,7 +84,7 @@ parser_init_guts(u64 addr, u32 bytes, bool local,
rc = NULL; rc = NULL;
goto cleanup; goto cleanup;
} }
p = __va((ulong) (addr)); p = __va((unsigned long) (addr));
memcpy(ctx->data, p, bytes); memcpy(ctx->data, p, bytes);
} else { } else {
rgn = visor_memregion_create(addr, bytes); rgn = visor_memregion_create(addr, bytes);
@ -165,7 +165,7 @@ parser_simpleString_get(struct parser_context *ctx)
/* Obtain a copy of the buffer in the payload area. /* Obtain a copy of the buffer in the payload area.
*/ */
void *parser_byte_stream_get(struct parser_context *ctx, ulong *nbytes) void *parser_byte_stream_get(struct parser_context *ctx, unsigned long *nbytes)
{ {
if (!ctx->byte_stream) if (!ctx->byte_stream)
return NULL; return NULL;
@ -265,7 +265,7 @@ void *
parser_param_get(struct parser_context *ctx, char *nam, int namesize) parser_param_get(struct parser_context *ctx, char *nam, int namesize)
{ {
u8 *pscan, *pnam = nam; u8 *pscan, *pnam = nam;
ulong nscan; unsigned long nscan;
int value_length = -1, orig_value_length = -1; int value_length = -1, orig_value_length = -1;
void *value = NULL; void *value = NULL;
int i; int i;
@ -400,7 +400,7 @@ void *
parser_string_get(struct parser_context *ctx) parser_string_get(struct parser_context *ctx)
{ {
u8 *pscan; u8 *pscan;
ulong nscan; unsigned long nscan;
int value_length = -1; int value_length = -1;
void *value = NULL; void *value = NULL;
int i; int i;

2
drivers/staging/unisys/visorchipset/parser.h
View file

@ -40,7 +40,7 @@ void *parser_param_get(struct parser_context *ctx, char *nam, int namesize);
void *parser_string_get(struct parser_context *ctx); void *parser_string_get(struct parser_context *ctx);
uuid_le parser_id_get(struct parser_context *ctx); uuid_le parser_id_get(struct parser_context *ctx);
char *parser_simpleString_get(struct parser_context *ctx); char *parser_simpleString_get(struct parser_context *ctx);
void *parser_byte_stream_get(struct parser_context *ctx, ulong *nbytes); void *parser_byte_stream_get(struct parser_context *ctx, unsigned long *nbytes);
void parser_done(struct parser_context *ctx); void parser_done(struct parser_context *ctx);
#endif #endif