Commit 8b867447 authored by Dominic Braun's avatar Dominic Braun Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Remove VCHIQ_CONFIG_T typedef 



Typedefing structs is not encouraged in the kernel.

Signed-off-by: default avatarDominic Braun <inf.braun@fau.de>
Signed-off-by: default avatarTobias Büttner <tobias.buettner@fau.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e69106e5

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

+1 −1
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


	case VCHIQ_IOC_GET_CONFIG: {

		VCHIQ_GET_CONFIG_T args;

		VCHIQ_CONFIG_T config;

		struct vchiq_config config;



		if (copy_from_user(&args, (const void __user *)arg,

			sizeof(args)) != 0) {

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

+1 −1
Original line number Diff line number Diff line
@@ -3271,7 +3271,7 @@ vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle, short *peer_version) 
	return status;

}



void vchiq_get_config(VCHIQ_CONFIG_T *config)

void vchiq_get_config(struct vchiq_config *config)

{

	config->max_msg_size           = VCHIQ_MAX_MSG_SIZE;

	config->bulk_threshold         = VCHIQ_MAX_MSG_SIZE;

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

+3 −3
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ typedef struct vchiq_service_params_struct { 
	short version_min;   /* Update for incompatible changes */

} VCHIQ_SERVICE_PARAMS_T;



typedef struct vchiq_config_struct {

struct vchiq_config {

	unsigned int max_msg_size;

	unsigned int bulk_threshold; /* The message size above which it

					is better to use a bulk transfer
@@ -119,7 +119,7 @@ typedef struct vchiq_config_struct { 
	unsigned int max_services;

	short version;      /* The version of VCHIQ */

	short version_min;  /* The minimum compatible version of VCHIQ */

} VCHIQ_CONFIG_T;

};



typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;

typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
@@ -162,7 +162,7 @@ extern VCHIQ_STATUS_T vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service, 
extern int   vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T service);

extern void *vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T service);

extern int   vchiq_get_service_fourcc(VCHIQ_SERVICE_HANDLE_T service);

extern void vchiq_get_config(VCHIQ_CONFIG_T *config);

extern void vchiq_get_config(struct vchiq_config *config);

extern VCHIQ_STATUS_T vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service,

	VCHIQ_SERVICE_OPTION_T option, int value);

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ typedef struct { 


typedef struct {

	unsigned int config_size;

	VCHIQ_CONFIG_T __user *pconfig;

	struct vchiq_config __user *pconfig;

} VCHIQ_GET_CONFIG_T;



typedef struct {