Commit 31d2ad61 authored by Umang Jain's avatar Umang Jain Committed by Greg Kroah-Hartman
Browse files

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: default avatarUmang Jain <umang.jain@ideasonboard.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/20240919142130.1331495-4-umang.jain@ideasonboard.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 72d092f1

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

+4 −0
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ 
#define MAKE_REMOTE_USE			(VCHIQ_MSG_REMOTE_USE << TYPE_SHIFT)

#define MAKE_REMOTE_USE_ACTIVE		(VCHIQ_MSG_REMOTE_USE_ACTIVE << TYPE_SHIFT)



#define PAGELIST_WRITE			0

#define PAGELIST_READ			1

#define PAGELIST_READ_WITH_FRAGMENTS	2



#define BELL2	0x08



/* Ensure the fields are wide enough */

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

+10 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


#include "../../include/linux/raspberrypi/vchiq.h"

#include "vchiq_cfg.h"

#include "vchiq_pagelist.h"



/* Do this so that we can test-build the code on non-rpi systems */

#if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
@@ -411,6 +410,16 @@ struct vchiq_state { 
	struct opaque_platform_state *platform_state;

};



struct pagelist {

	u32 length;

	u16 type;

	u16 offset;

	u32 addrs[1];	/* N.B. 12 LSBs hold the number

			 * of following pages at consecutive

			 * addresses.

			 */

};



struct vchiq_pagelist_info {

	struct pagelist *pagelist;

	size_t pagelist_buffer_size;

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

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/* Copyright (c) 2010-2012 Broadcom. All rights reserved. */



#ifndef VCHIQ_PAGELIST_H

#define VCHIQ_PAGELIST_H



#define PAGELIST_WRITE 0

#define PAGELIST_READ 1

#define PAGELIST_READ_WITH_FRAGMENTS 2



struct pagelist {

	u32 length;

	u16 type;

	u16 offset;

	u32 addrs[1];	/* N.B. 12 LSBs hold the number

			 * of following pages at consecutive

			 * addresses.

			 */

};



#endif /* VCHIQ_PAGELIST_H */