Commit 364d26f1 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman

staging: vc04_services: Use preferred kernel types

This patch fixes issues reported by checkpatch.pl about preferred
kernel types.
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 94316673
...@@ -194,7 +194,7 @@ vchiq_static_assert(ARRAY_SIZE(ioctl_names) == ...@@ -194,7 +194,7 @@ vchiq_static_assert(ARRAY_SIZE(ioctl_names) ==
(VCHIQ_IOC_MAX + 1)); (VCHIQ_IOC_MAX + 1));
static void static void
dump_phys_mem(void *virt_addr, uint32_t num_bytes); dump_phys_mem(void *virt_addr, u32 num_bytes);
/**************************************************************************** /****************************************************************************
* *
...@@ -1535,10 +1535,10 @@ vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service) ...@@ -1535,10 +1535,10 @@ vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
***************************************************************************/ ***************************************************************************/
static void static void
dump_phys_mem(void *virt_addr, uint32_t num_bytes) dump_phys_mem(void *virt_addr, u32 num_bytes)
{ {
int rc; int rc;
uint8_t *end_virt_addr = virt_addr + num_bytes; u8 *end_virt_addr = virt_addr + num_bytes;
int num_pages; int num_pages;
int offset; int offset;
int end_offset; int end_offset;
...@@ -1546,7 +1546,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes) ...@@ -1546,7 +1546,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes)
int prev_idx; int prev_idx;
struct page *page; struct page *page;
struct page **pages; struct page **pages;
uint8_t *kmapped_virt_ptr; u8 *kmapped_virt_ptr;
/* Align virtAddr and endVirtAddr to 16 byte boundaries. */ /* Align virtAddr and endVirtAddr to 16 byte boundaries. */
...@@ -1602,7 +1602,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes) ...@@ -1602,7 +1602,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes)
if (vchiq_arm_log_level >= VCHIQ_LOG_TRACE) if (vchiq_arm_log_level >= VCHIQ_LOG_TRACE)
vchiq_log_dump_mem("ph", vchiq_log_dump_mem("ph",
(uint32_t)(unsigned long)&kmapped_virt_ptr[ (u32)(unsigned long)&kmapped_virt_ptr[
page_offset], page_offset],
&kmapped_virt_ptr[page_offset], 16); &kmapped_virt_ptr[page_offset], 16);
......
...@@ -517,7 +517,7 @@ get_connected_service(VCHIQ_STATE_T *state, unsigned int port) ...@@ -517,7 +517,7 @@ get_connected_service(VCHIQ_STATE_T *state, unsigned int port)
inline void inline void
request_poll(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, int poll_type) request_poll(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, int poll_type)
{ {
uint32_t value; u32 value;
if (service) { if (service) {
do { do {
...@@ -1286,14 +1286,14 @@ poll_services(VCHIQ_STATE_T *state) ...@@ -1286,14 +1286,14 @@ poll_services(VCHIQ_STATE_T *state)
int group, i; int group, i;
for (group = 0; group < BITSET_SIZE(state->unused_service); group++) { for (group = 0; group < BITSET_SIZE(state->unused_service); group++) {
uint32_t flags; u32 flags;
flags = atomic_xchg(&state->poll_services[group], 0); flags = atomic_xchg(&state->poll_services[group], 0);
for (i = 0; flags; i++) { for (i = 0; flags; i++) {
if (flags & (1 << i)) { if (flags & (1 << i)) {
VCHIQ_SERVICE_T *service = VCHIQ_SERVICE_T *service =
find_service_by_port(state, find_service_by_port(state,
(group<<5) + i); (group<<5) + i);
uint32_t service_flags; u32 service_flags;
flags &= ~(1 << i); flags &= ~(1 << i);
if (!service) if (!service)
continue; continue;
...@@ -3879,10 +3879,10 @@ VCHIQ_STATUS_T vchiq_send_remote_use_active(VCHIQ_STATE_T *state) ...@@ -3879,10 +3879,10 @@ VCHIQ_STATUS_T vchiq_send_remote_use_active(VCHIQ_STATE_T *state)
return status; return status;
} }
void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *void_mem, void vchiq_log_dump_mem(const char *label, u32 addr, const void *void_mem,
size_t num_bytes) size_t num_bytes)
{ {
const uint8_t *mem = (const uint8_t *)void_mem; const u8 *mem = (const u8 *)void_mem;
size_t offset; size_t offset;
char line_buf[100]; char line_buf[100];
char *s; char *s;
...@@ -3899,7 +3899,7 @@ void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *void_mem, ...@@ -3899,7 +3899,7 @@ void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *void_mem,
for (offset = 0; offset < 16; offset++) { for (offset = 0; offset < 16; offset++) {
if (offset < num_bytes) { if (offset < num_bytes) {
uint8_t ch = mem[offset]; u8 ch = mem[offset];
if ((ch < ' ') || (ch > '~')) if ((ch < ' ') || (ch > '~'))
ch = '.'; ch = '.';
......
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