staging: vc04_services: Remove PAGELIST_T typedef

Typedefing structs is not encouraged in the kernel.

Signed-off-by: Dominic Braun <inf.braun@fau.de>
Signed-off-by: Tobias Büttner <tobias.buettner@fau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index 66fbb9ff551a6da7784e9a3f90efb94137f03207..5307174b601cedbffa9ce588ff9c0647d9609460 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -64,7 +64,7 @@ struct vchiq_2835_state {
 };
 
 struct vchiq_pagelist_info {
-       PAGELIST_T *pagelist;
+       struct pagelist *pagelist;
        size_t pagelist_buffer_size;
        dma_addr_t dma_addr;
        enum dma_data_direction dma_dir;
@@ -383,7 +383,7 @@ cleanup_pagelistinfo(struct vchiq_pagelist_info *pagelistinfo)
 static struct vchiq_pagelist_info *
 create_pagelist(char __user *buf, size_t count, unsigned short type)
 {
-       PAGELIST_T *pagelist;
+       struct pagelist *pagelist;
        struct vchiq_pagelist_info *pagelistinfo;
        struct page **pages;
        u32 *addrs;
@@ -397,7 +397,7 @@ create_pagelist(char __user *buf, size_t count, unsigned short type)
        offset = ((unsigned int)(unsigned long)buf & (PAGE_SIZE - 1));
        num_pages = DIV_ROUND_UP(count + offset, PAGE_SIZE);
 
-       pagelist_size = sizeof(PAGELIST_T) +
+       pagelist_size = sizeof(struct pagelist) +
                        (num_pages * sizeof(u32)) +
                        (num_pages * sizeof(pages[0]) +
                        (num_pages * sizeof(struct scatterlist))) +
@@ -565,8 +565,8 @@ static void
 free_pagelist(struct vchiq_pagelist_info *pagelistinfo,
              int actual)
 {
-       PAGELIST_T *pagelist   = pagelistinfo->pagelist;
-       struct page **pages    = pagelistinfo->pages;
+       struct pagelist *pagelist = pagelistinfo->pagelist;
+       struct page **pages = pagelistinfo->pages;
        unsigned int num_pages = pagelistinfo->num_pages;
 
        vchiq_log_trace(vchiq_arm_log_level, "%s - %pK, %d",

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
index bec411061554c53f688b9043e6ada8814b394050..4eaf7398cf2ee4100b219f3a2791d1a0a330de75 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
@@ -38,7 +38,7 @@
 #define PAGELIST_READ 1
 #define PAGELIST_READ_WITH_FRAGMENTS 2
 
-typedef struct pagelist_struct {
+struct pagelist {
        u32 length;
        u16 type;
        u16 offset;
@@ -46,6 +46,6 @@ typedef struct pagelist_struct {
                         * of following pages at consecutive
                         * addresses.
                         */
-} PAGELIST_T;
+};
 
 #endif /* VCHIQ_PAGELIST_H */