staging: mmal-vchiq: clear redundant item named bulk_scratch
authorXiaoke Wang <xkernel.wang@foxmail.com>
Tue, 15 Mar 2022 17:24:12 +0000 (01:24 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Mar 2022 12:42:26 +0000 (13:42 +0100)
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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
Link: https://lore.kernel.org/r/tencent_F721901366AB5C720E008AF7F02DA5D3FF07@qq.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c

index cb6cdbf..70c9d55 100644 (file)
@@ -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 @@ err_close_services:
        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);