diff mbox series

[v3,01/15] media: mtk-vcodec: Get numbers of register bases from DT

Message ID 20210727101051.24418-2-yunfei.dong@mediatek.com
State Superseded
Headers show
Series Using component framework to support multi hardware decode | expand

Commit Message

Yunfei Dong July 27, 2021, 10:10 a.m. UTC 
Different platform may has different numbers of register bases. Gets the
numbers of register bases from DT (sizeof(u32) * 4 bytes for each).

Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
---
v3: fix return value
---
 .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c  | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

Comments

Tzung-Bi Shih July 30, 2021, 9:31 a.m. UTC | #1 
On Tue, Jul 27, 2021 at 06:10:37PM +0800, Yunfei Dong wrote:
> +static int mtk_vcodec_get_reg_bases(struct mtk_vcodec_dev *dev)

> +{

> +     struct platform_device *pdev = dev->plat_dev;

> +     int reg_num, i, ret = 0;

ret don't need to be initialized.

> +     for (i = 0; i < reg_num; i++) {

> +             dev->reg_base[i] = devm_platform_ioremap_resource(pdev, i);

> +             if (IS_ERR((__force void *)dev->reg_base[i])) {

> +                     return PTR_ERR((__force void *)dev->reg_base[i]);

> +             }

{ } can be removed.
Dafna Hirschfeld July 30, 2021, 10:09 a.m. UTC | #2 
On 30.07.21 11:31, Tzung-Bi Shih wrote:
> On Tue, Jul 27, 2021 at 06:10:37PM +0800, Yunfei Dong wrote:

>> +static int mtk_vcodec_get_reg_bases(struct mtk_vcodec_dev *dev)

>> +{

>> +     struct platform_device *pdev = dev->plat_dev;

>> +     int reg_num, i, ret = 0;

> ret don't need to be initialized.

> 

>> +     for (i = 0; i < reg_num; i++) {

>> +             dev->reg_base[i] = devm_platform_ioremap_resource(pdev, i);

>> +             if (IS_ERR((__force void *)dev->reg_base[i])) {

>> +                     return PTR_ERR((__force void *)dev->reg_base[i]);

>> +             }

> { } can be removed.


I think that also the "__fore void*" can be removed

thanks,
Dafna

>
diff mbox series

Patch

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
index 55ae198dbcf9..c4172c18a61f 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@ -78,6 +78,30 @@  static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv)
 	return IRQ_HANDLED;
 }
 
+static int mtk_vcodec_get_reg_bases(struct mtk_vcodec_dev *dev)
+{
+	struct platform_device *pdev = dev->plat_dev;
+	int reg_num, i, ret = 0;
+
+	/* Sizeof(u32) * 4 bytes for each register base. */
+	reg_num = of_property_count_elems_of_size(pdev->dev.of_node, "reg",
+		sizeof(u32) * 4);
+	if (reg_num <= 0 || reg_num > NUM_MAX_VDEC_REG_BASE) {
+		dev_err(&pdev->dev, "Invalid register property size: %d\n", reg_num);
+		return -EINVAL;
+	}
+
+	for (i = 0; i < reg_num; i++) {
+		dev->reg_base[i] = devm_platform_ioremap_resource(pdev, i);
+		if (IS_ERR((__force void *)dev->reg_base[i])) {
+			return PTR_ERR((__force void *)dev->reg_base[i]);
+		}
+		mtk_v4l2_debug(2, "reg[%d] base=%p", i, dev->reg_base[i]);
+	}
+
+	return ret;
+}
+
 static int fops_vcodec_open(struct file *file)
 {
 	struct mtk_vcodec_dev *dev = video_drvdata(file);
@@ -206,7 +230,7 @@  static int mtk_vcodec_probe(struct platform_device *pdev)
 	struct resource *res;
 	phandle rproc_phandle;
 	enum mtk_vcodec_fw_type fw_type;
-	int i, ret;
+	int ret;
 
 	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
 	if (!dev)
@@ -238,14 +262,9 @@  static int mtk_vcodec_probe(struct platform_device *pdev)
 		goto err_dec_pm;
 	}
 
-	for (i = 0; i < NUM_MAX_VDEC_REG_BASE; i++) {
-		dev->reg_base[i] = devm_platform_ioremap_resource(pdev, i);
-		if (IS_ERR((__force void *)dev->reg_base[i])) {
-			ret = PTR_ERR((__force void *)dev->reg_base[i]);
-			goto err_res;
-		}
-		mtk_v4l2_debug(2, "reg[%d] base=%p", i, dev->reg_base[i]);
-	}
+	ret = mtk_vcodec_get_reg_bases(dev);
+	if (ret)
+		goto err_res;
 
 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 	if (res == NULL) {