Skip to content

Commit 31d2ad6

Browse files
Umang Jaingregkh
authored andcommitted
staging: vchiq_core: Drop vchiq_pagelist.h
vchiq_pagelist.h only defines one struct and a couple of macros. It can be merged with vchiq_core since all the pagelist related function helpers are now in vchiq_core for bulk transfers. Move the struct and related macros to vchiq_core header and drop vchiq_pagelist.h. Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://lore.kernel.org/r/20240919142130.1331495-4-umang.jain@ideasonboard.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 72d092f commit 31d2ad6

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
#define MAKE_REMOTE_USE (VCHIQ_MSG_REMOTE_USE << TYPE_SHIFT)
6464
#define MAKE_REMOTE_USE_ACTIVE (VCHIQ_MSG_REMOTE_USE_ACTIVE << TYPE_SHIFT)
6565

66+
#define PAGELIST_WRITE 0
67+
#define PAGELIST_READ 1
68+
#define PAGELIST_READ_WITH_FRAGMENTS 2
69+
6670
#define BELL2 0x08
6771

6872
/* Ensure the fields are wide enough */

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include "../../include/linux/raspberrypi/vchiq.h"
1919
#include "vchiq_cfg.h"
20-
#include "vchiq_pagelist.h"
2120

2221
/* Do this so that we can test-build the code on non-rpi systems */
2322
#if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
@@ -411,6 +410,16 @@ struct vchiq_state {
411410
struct opaque_platform_state *platform_state;
412411
};
413412

413+
struct pagelist {
414+
u32 length;
415+
u16 type;
416+
u16 offset;
417+
u32 addrs[1]; /* N.B. 12 LSBs hold the number
418+
* of following pages at consecutive
419+
* addresses.
420+
*/
421+
};
422+
414423
struct vchiq_pagelist_info {
415424
struct pagelist *pagelist;
416425
size_t pagelist_buffer_size;

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)