media: mtk-jpeg: refactor hw dev initializaiton

Add a atomic_t variable for initialization of hw dev.

Signed-off-by: kyrie wu <kyrie.wu@mediatek.com>
Signed-off-by: irui wang <irui.wang@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
index 0c562eafbfa619c551133b13e109fd3667a366c6..e0f76fbcc5a6fdb2f7345c095102209b10b9862e 100644 (file)
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
@@ -1742,6 +1742,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
                        num_child++;
 
                atomic_set(&jpeg->hw_rdy, num_child);
+               atomic_set(&jpeg->hw_index, 0);
 
                jpeg->workqueue = alloc_ordered_workqueue(MTK_JPEG_NAME,
                                                          WQ_MEM_RECLAIM

diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
index 89242e407dc9836a519d8b6f1fc735fee90731d1..8ba6e757e11aa93e154c2fa9c7965cd494753765 100644 (file)
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
@@ -208,6 +208,7 @@ struct mtk_jpegdec_comp_dev {
  * @hw_rdy:            jpg hw ready flag
  * @reg_decbase:       jpg decode register base addr
  * @dec_hw_dev:        jpg decode hardware device
+ * @hw_index:          jpg hw index
  */
 struct mtk_jpeg_dev {
        struct mutex            lock;
@@ -229,6 +230,7 @@ struct mtk_jpeg_dev {
 
        void __iomem *reg_decbase[MTK_JPEGDEC_HW_MAX];
        struct mtk_jpegdec_comp_dev *dec_hw_dev[MTK_JPEGDEC_HW_MAX];
+       atomic_t hw_index;
 };
 
 /**

diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
index b7c2de2489b0512bcc262b9e152b724db322969c..869068fac5e2f9ae8cb25e02ce12be285fd6d25d 100644 (file)
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
@@ -638,14 +638,10 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
                return dev_err_probe(&pdev->dev, ret,
                                     "Failed to register JPEGDEC irq handler.\n");
 
-       for (i = 0; i < MTK_JPEGDEC_HW_MAX; i++) {
-               if (master_dev->dec_hw_dev[i])
-                       continue;
-
-               master_dev->dec_hw_dev[i] = dev;
-               master_dev->reg_decbase[i] = dev->reg_base;
-               dev->master_dev = master_dev;
-       }
+       i = atomic_add_return(1, &master_dev->hw_index) - 1;
+       master_dev->dec_hw_dev[i] = dev;
+       master_dev->reg_decbase[i] = dev->reg_base;
+       dev->master_dev = master_dev;
 
        platform_set_drvdata(pdev, dev);
        pm_runtime_enable(&pdev->dev);

diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
index e35ee1bdce3dc75612282980e52cc737adfba2aa..71e85b4bbf12762ae175dd6af8ecbdc9bc93101b 100644 (file)
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
@@ -362,14 +362,10 @@ static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) {
-               if (master_dev->enc_hw_dev[i])
-                       continue;
-
-               master_dev->enc_hw_dev[i] = dev;
-               master_dev->reg_encbase[i] = dev->reg_base;
-               dev->master_dev = master_dev;
-       }
+       i = atomic_add_return(1, &master_dev->hw_index) - 1;
+       master_dev->enc_hw_dev[i] = dev;
+       master_dev->reg_encbase[i] = dev->reg_base;
+       dev->master_dev = master_dev;
 
        platform_set_drvdata(pdev, dev);
        pm_runtime_enable(&pdev->dev);