Commit 33bdf010 authored by Umang Jain's avatar Umang Jain Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Pass struct device to vchiq_init_slots() 



Pass struct device pointer to vchiq_init_slots(). In subsequent
commits, vchiq_log_* macros will be ported to use dynamic debug
(dev_dbg()), hence they need access to a struct device pointer.

No functional changes intended in this commit.

Signed-off-by: default avatarUmang Jain <umang.jain@ideasonboard.com>
Link: https://lore.kernel.org/r/20231024114428.443528-3-umang.jain@ideasonboard.com


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

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

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ static int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state 


	WARN_ON(((unsigned long)slot_mem & (PAGE_SIZE - 1)) != 0);



	vchiq_slot_zero = vchiq_init_slots(slot_mem, slot_mem_size);

	vchiq_slot_zero = vchiq_init_slots(dev, slot_mem, slot_mem_size);

	if (!vchiq_slot_zero)

		return -ENOMEM;

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

+1 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ get_conn_state_name(enum vchiq_connstate conn_state) 
}



struct vchiq_slot_zero *

vchiq_init_slots(void *mem_base, int mem_size)

vchiq_init_slots(struct device *dev, void *mem_base, int mem_size)

{

	int mem_align =

		(int)((VCHIQ_SLOT_SIZE - (long)mem_base) & VCHIQ_SLOT_MASK);

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

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ extern const char * 
get_conn_state_name(enum vchiq_connstate conn_state);



extern struct vchiq_slot_zero *

vchiq_init_slots(void *mem_base, int mem_size);

vchiq_init_slots(struct device *dev, void *mem_base, int mem_size);



extern int

vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero, struct device *dev);