Commit 9b630000 authored by Xiaoke Wang's avatar Xiaoke Wang Committed by Greg Kroah-Hartman
Browse files

staging: mmal-vchiq: clear redundant item named bulk_scratch 



bulk_scratch is not used anywhere and the original allocation of it
does not have proper check.
Deleting it directly seems to be a good choice.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarXiaoke Wang <xkernel.wang@foxmail.com>
Link: https://lore.kernel.org/r/tencent_F721901366AB5C720E008AF7F02DA5D3FF07@qq.com


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

drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c

+0 −7
Original line number Diff line number Diff line
@@ -168,9 +168,6 @@ struct vchiq_mmal_instance { 
	/* ensure serialised access to service */

	struct mutex vchiq_mutex;



	/* vmalloc page to receive scratch bulk xfers into */

	void *bulk_scratch;



	struct idr context_map;

	/* protect accesses to context_map */

	struct mutex context_map_lock;
@@ -1847,8 +1844,6 @@ int vchiq_mmal_finalise(struct vchiq_mmal_instance *instance) 
	flush_workqueue(instance->bulk_wq);

	destroy_workqueue(instance->bulk_wq);



	vfree(instance->bulk_scratch);



	idr_destroy(&instance->context_map);



	kfree(instance);
@@ -1908,7 +1903,6 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance) 


	mutex_init(&instance->vchiq_mutex);



	instance->bulk_scratch = vmalloc(PAGE_SIZE);

	instance->vchiq_instance = vchiq_instance;



	mutex_init(&instance->context_map_lock);
@@ -1939,7 +1933,6 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance) 
	vchiq_close_service(instance->service_handle);

	destroy_workqueue(instance->bulk_wq);

err_free:

	vfree(instance->bulk_scratch);

	kfree(instance);

err_shutdown_vchiq:

	vchiq_shutdown(vchiq_instance);