staging: vc04_services: Use preferred kernel types

This patch fixes issues reported by checkpatch.pl about preferred
kernel types.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 758a3a8ab54b6f21f6e73d408a3fdc83a1d8d99f..46fc06d96df6d4bb1c1021329c461be11a8865e7 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -194,7 +194,7 @@ vchiq_static_assert(ARRAY_SIZE(ioctl_names) ==
                    (VCHIQ_IOC_MAX + 1));
 
 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)
 ***************************************************************************/
 
 static void
-dump_phys_mem(void *virt_addr, uint32_t num_bytes)
+dump_phys_mem(void *virt_addr, u32 num_bytes)
 {
        int            rc;
-       uint8_t       *end_virt_addr = virt_addr + num_bytes;
+       u8            *end_virt_addr = virt_addr + num_bytes;
        int            num_pages;
        int            offset;
        int            end_offset;
@@ -1546,7 +1546,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes)
        int            prev_idx;
        struct page   *page;
        struct page  **pages;
-       uint8_t       *kmapped_virt_ptr;
+       u8            *kmapped_virt_ptr;
 
        /* Align virtAddr and endVirtAddr to 16 byte boundaries. */
 
@@ -1602,7 +1602,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes)
 
                if (vchiq_arm_log_level >= VCHIQ_LOG_TRACE)
                        vchiq_log_dump_mem("ph",
-                               (uint32_t)(unsigned long)&kmapped_virt_ptr[
+                               (u32)(unsigned long)&kmapped_virt_ptr[
                                        page_offset],
                                &kmapped_virt_ptr[page_offset], 16);
 

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 623163a967e78467559114154f666b714b1140a4..dfee63e57588737397cf09f0297aca44afce70d0 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -517,7 +517,7 @@ get_connected_service(VCHIQ_STATE_T *state, unsigned int port)
 inline void
 request_poll(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, int poll_type)
 {
-       uint32_t value;
+       u32 value;
 
        if (service) {
                do {
@@ -1286,14 +1286,14 @@ poll_services(VCHIQ_STATE_T *state)
        int group, i;
 
        for (group = 0; group < BITSET_SIZE(state->unused_service); group++) {
-               uint32_t flags;
+               u32 flags;
                flags = atomic_xchg(&state->poll_services[group], 0);
                for (i = 0; flags; i++) {
                        if (flags & (1 << i)) {
                                VCHIQ_SERVICE_T *service =
                                        find_service_by_port(state,
                                                (group<<5) + i);
-                               uint32_t service_flags;
+                               u32 service_flags;
                                flags &= ~(1 << i);
                                if (!service)
                                        continue;
@@ -3879,10 +3879,10 @@ VCHIQ_STATUS_T vchiq_send_remote_use_active(VCHIQ_STATE_T *state)
        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)
 {
-       const uint8_t  *mem = (const uint8_t *)void_mem;
+       const u8  *mem = (const u8 *)void_mem;
        size_t          offset;
        char            line_buf[100];
        char           *s;
@@ -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++) {
                        if (offset < num_bytes) {
-                               uint8_t ch = mem[offset];
+                               u8 ch = mem[offset];
 
                                if ((ch < ' ') || (ch > '~'))
                                        ch = '.';