media: amphion: Slightly simplify vpu_core_register()

"vpu_core->msg_buffer_size" is unused out-side of vpu_core_register().
There is no need to save this value in struct vpu_core.

Remove it and use a local variable instead.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/platform/amphion/vpu.h b/drivers/media/platform/amphion/vpu.h
index 22f0da26ccec79f78d573768bba635134bdd26d8..1451549c9dd206c1b30170f839e8f8c430e09e55 100644 (file)
--- a/drivers/media/platform/amphion/vpu.h
+++ b/drivers/media/platform/amphion/vpu.h
@@ -162,7 +162,6 @@ struct vpu_core {
        struct delayed_work msg_delayed_work;
        struct kfifo msg_fifo;
        void *msg_buffer;
-       unsigned int msg_buffer_size;
 
        struct vpu_dev *vpu;
        void *iface;

diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/amphion/vpu_core.c
index 8df85c14ab3fb9b7f4ae5df6da2f86ec0a018628..da00f5fc0e5da15817a6a09cccc07470a572aec3 100644 (file)
--- a/drivers/media/platform/amphion/vpu_core.c
+++ b/drivers/media/platform/amphion/vpu_core.c
@@ -250,6 +250,7 @@ static void vpu_core_get_vpu(struct vpu_core *core)
 static int vpu_core_register(struct device *dev, struct vpu_core *core)
 {
        struct vpu_dev *vpu = dev_get_drvdata(dev);
+       unsigned int buffer_size;
        int ret = 0;
 
        dev_dbg(core->dev, "register core %s\n", vpu_core_type_desc(core->type));
@@ -263,14 +264,14 @@ static int vpu_core_register(struct device *dev, struct vpu_core *core)
        }
        INIT_WORK(&core->msg_work, vpu_msg_run_work);
        INIT_DELAYED_WORK(&core->msg_delayed_work, vpu_msg_delayed_work);
-       core->msg_buffer_size = roundup_pow_of_two(VPU_MSG_BUFFER_SIZE);
-       core->msg_buffer = vzalloc(core->msg_buffer_size);
+       buffer_size = roundup_pow_of_two(VPU_MSG_BUFFER_SIZE);
+       core->msg_buffer = vzalloc(buffer_size);
        if (!core->msg_buffer) {
                dev_err(core->dev, "failed allocate buffer for fifo\n");
                ret = -ENOMEM;
                goto error;
        }
-       ret = kfifo_init(&core->msg_fifo, core->msg_buffer, core->msg_buffer_size);
+       ret = kfifo_init(&core->msg_fifo, core->msg_buffer, buffer_size);
        if (ret) {
                dev_err(core->dev, "failed init kfifo\n");
                goto error;