From patchwork Wed Jul 19 07:50:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 122446 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2281563vqt; Wed, 19 Jul 2023 01:17:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlFbCfJIuBNSf6fvwWeLf1Ni+PIxvpQpn8epbqd6Cj7uTmCVz761QvtRJ5LPUjF5mQ4c3QFT X-Received: by 2002:a17:907:7746:b0:993:d617:bdc2 with SMTP id kx6-20020a170907774600b00993d617bdc2mr1500261ejc.75.1689754647763; Wed, 19 Jul 2023 01:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689754647; cv=none; d=google.com; s=arc-20160816; b=JHvYvmP5M8Ded46J0jd5PjH3p0Urljci0v/8IetJwxanBrtA9FPkm2RjEIVZis3Ar/ vZ6kC1eL7AfgjDGs5cuVuzvus7FIsLwbwO/8puxR5qZjnl02VkJvPNaS6bxppRT6kWwz 1zDmWgCDCOvlG7JfpFF+Xj2GUUCK4PerfNBQQqelt8YNCmzgt2vdxYdUHvszBziKVweH gkgv3RCF1yC1DGRshs6oyfebovTsNM3dj8dplg8eYNO1LpXen5pbjZeXsCK3Qg64Ng4c EvPQfVHNLCE1GQhvv2YrGkZyZ2hYqrHrwR9sMP6jkl+BvlUwFEkpYnksz6XYDWT4DF61 liPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=36nLmUkMoaPNfFqc2lZwJu0SPk871bx2ndAXsjrjZM4=; fh=NKnLsaTUs6DGQa/OThi18WPpEgJ637Y16FMWW8s0AeQ=; b=PmwFOnesSAFNjeRQq/TKh2VRT2yxDCZMuqLr+L/5qgzKHo+4ZNlkIdEfeHL8Mq7HxQ YIdficrojymtt0PWPssQgUA/SJr+U943Cbne8t0cmH59TeKDQpYBomDj9ZsPoofkERyE 5q/sro+NdfAuDDLB2i5EBUMPQpTJUV15nIBsqaHn07AKbDCIl0cZcmFerxTWN3s6ALb/ DAQx4kS+CMzYPbt6Z/dS6DDS4fB+DXRf7Do0kp7YrZ4mdOfh2wR0hfzOb76gqUiigfQU mBZIvCTHuzvWHNalnW9av2N+zJMnL1g6RzNoORuMk4mqeDGOKfLmRnPrD4nDAQ7p2HRm FXsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=YVm9nlsm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c23-20020a170906341700b0098843bd4387si2441163ejb.320.2023.07.19.01.17.03; Wed, 19 Jul 2023 01:17:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=YVm9nlsm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230027AbjGSHvN (ORCPT + 99 others); Wed, 19 Jul 2023 03:51:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229757AbjGSHvJ (ORCPT ); Wed, 19 Jul 2023 03:51:09 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF6BC134 for ; Wed, 19 Jul 2023 00:51:08 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id D5D6A6607070; Wed, 19 Jul 2023 08:51:06 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1689753067; bh=n4bzSjz/8ToatLkUrHwwNZNY341UFIC11J8xZSFamQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YVm9nlsm7Q93D67X1+1cSOFc6xkeULgbJzUdCUPhr5LLjVwqs6hPTFnkancL7h/IH e38JSizfJc9RmGiUIb3+LsqCAwc/M0GhFCQZ9cM5oYhe4Zrl1vV2Dk2hdsiM8DEKd2 lajRt6cmWVXGyLUc1jDVhFr8Ba8pw0XAxc1ZOdTQHCB81W8OW4MW9G2bvp+3DNrTNF Tw1hvo2MlLdOl89ZJj4gkdkfQVdAFx2QL7a/D+XpRz4nuDeqLO7R/xoK7KWQLgnzzX kGsW1hc7nLyQ1RGMbuOJ45HuSPW1+/6gmkcCVhmS3GvCrJy10ef+1fACwOzD3Rmy2P WIIP7xHk3LW+Q== From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, daniel@ffwll.ch, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, fshao@chromium.org Subject: [PATCH v2 1/6] drm/mediatek: mtk_dpi: Simplify with devm_drm_bridge_add() Date: Wed, 19 Jul 2023 09:50:51 +0200 Message-Id: <20230719075056.72178-2-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> References: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771836169746603177 X-GMAIL-MSGID: 1771836169746603177 Change drm_bridge_add() to its devm variant to slightly simplify the probe function. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Fei Shao Reviewed-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 948a53f1f4b3..74068aa70e0c 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -1090,11 +1090,12 @@ static int mtk_dpi_probe(struct platform_device *pdev) dpi->bridge.of_node = dev->of_node; dpi->bridge.type = DRM_MODE_CONNECTOR_DPI; - drm_bridge_add(&dpi->bridge); + ret = devm_drm_bridge_add(dev, &dpi->bridge); + if (ret) + return ret; ret = component_add(dev, &mtk_dpi_component_ops); if (ret) { - drm_bridge_remove(&dpi->bridge); dev_err(dev, "Failed to add component: %d\n", ret); return ret; } @@ -1107,7 +1108,6 @@ static int mtk_dpi_remove(struct platform_device *pdev) struct mtk_dpi *dpi = platform_get_drvdata(pdev); component_del(&pdev->dev, &mtk_dpi_component_ops); - drm_bridge_remove(&dpi->bridge); return 0; } From patchwork Wed Jul 19 07:50:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 122444 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2278584vqt; Wed, 19 Jul 2023 01:11:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlGONgtpT9xJmHmvBuJAoQeHa3byYNQ/PYe76azfNAch9gOnjCZMpRagdAVjXwiMwK6trcsY X-Received: by 2002:a17:902:dad2:b0:1b9:de67:2870 with SMTP id q18-20020a170902dad200b001b9de672870mr19004601plx.40.1689754271798; Wed, 19 Jul 2023 01:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689754271; cv=none; d=google.com; s=arc-20160816; b=BDetAb2B3jY5bCnN9mDiBCVNQsocYJnhde0C56TmTNqyarw8pL0ggaMO8RzRFh+mF+ 3E7xxaJU3yvklIsSxWqVlRUzgcXf7thNZVQ3qpOCQtd0lNE/RnV5iAo8qZLwZGT/oX8q WM+Cd1q+oID95tPO5zk/hgxrzvxbbCEjgekPQIuJtAG7RBausBy2znCTFTHAbczBWrQ5 oHJNVp3arx3YviraTzAh54tzopgqc6i6Yxgjg8dB+ekt0VTJEkC+yytwNX4IVhZDKYUS LzAGJH7+NP+ILGVEN5oxofusEw+hzEdSgzJaE4JZNyV0z7CD/7Rd0FQPSzihpMZuUWHN 1L+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=M8MaP6nQDZH8Y9K5brzxODK4teXwzKGzAUwaz8ZAK+g=; fh=NKnLsaTUs6DGQa/OThi18WPpEgJ637Y16FMWW8s0AeQ=; b=TrE7MM1tuzXZBX58FBzKAzj0t/qV+CfCTOwakdRTnEzGeO6c0S0L2XB+Yq2hMdv7dU WjtK7BKklHcDhoK8aN2XbahXqaAMyG+/jw2R1XP/z2UvVvL6aYJamOxrJ24BTgqQ1cEx GOosef5ou4bHJCCLqWP3pjiWoDIoUUotkXYdR3nN4LYsocRfPDSb9oBn8rYOzRF02sDP wJcitT5TffXykwb0PjdinthTH/UVPRg5uQ+KpwMMPFinK997HOteyfrbGLfvVo5x+KXN iBwjYZWj6tMPoOMHk0H5SNZ8ZG34J+Qf5rDeRvMwqww40glHP00Vz+kMKU8bYVnPNa1U y2yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=ljb+s1S6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g21-20020a170902d1d500b001b89302ca7esi2979304plb.574.2023.07.19.01.10.57; Wed, 19 Jul 2023 01:11:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=ljb+s1S6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230200AbjGSHvS (ORCPT + 99 others); Wed, 19 Jul 2023 03:51:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229900AbjGSHvK (ORCPT ); Wed, 19 Jul 2023 03:51:10 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 666AD1736 for ; Wed, 19 Jul 2023 00:51:09 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 9E2836607071; Wed, 19 Jul 2023 08:51:07 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1689753068; bh=/guFaoIX4NI5OLZeiGkk3cUFsDGNGR4HcNgc6I/UWos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ljb+s1S6A8nO+QXVJGYqXNZhgvYVDxBP5cztZP78sAI6qJyRz19cr0+vozAQXFu5s vZXdUPEaK3xCVFUJrOZN0eBq1yxI3hJpqDHGTExl7i2YFMAqkAi3Ka0D59p6VbCHas Ye0UqOBfOAYNWJgGCPm9ZRwoFUEeT1aUgs0Oj7sgMbYvILT6GwN1+8v2S+0k0a297I S8YXqpUrkW++CJVmlRkb0m7ILU4AFrEAK/+QTLL8VGvbDd7HBhInzlB9zmRC0p5Uqm 8lJ0AlnsibrBCL9mZgJjUqULuAxdPy7RuuWJCtIRzONnhyz4Uv7v25uJ4C8HvyyHVk aA8YxemF+Eo5A== From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, daniel@ffwll.ch, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, fshao@chromium.org Subject: [PATCH v2 2/6] drm/mediatek: mtk_dpi: Simplify with dev_err_probe() Date: Wed, 19 Jul 2023 09:50:52 +0200 Message-Id: <20230719075056.72178-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> References: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771835775582473051 X-GMAIL-MSGID: 1771835775582473051 Use dev_err_probe() across the entire probe function of this driver to shrink the size. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Fei Shao Reviewed-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_dpi.c | 44 ++++++++++-------------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 74068aa70e0c..03a2b900bb50 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -1040,38 +1040,24 @@ static int mtk_dpi_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); dpi->regs = devm_ioremap_resource(dev, mem); - if (IS_ERR(dpi->regs)) { - ret = PTR_ERR(dpi->regs); - dev_err(dev, "Failed to ioremap mem resource: %d\n", ret); - return ret; - } + if (IS_ERR(dpi->regs)) + return dev_err_probe(dev, PTR_ERR(dpi->regs), + "Failed to ioremap mem resource\n"); dpi->engine_clk = devm_clk_get(dev, "engine"); - if (IS_ERR(dpi->engine_clk)) { - ret = PTR_ERR(dpi->engine_clk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "Failed to get engine clock: %d\n", ret); - - return ret; - } + if (IS_ERR(dpi->engine_clk)) + return dev_err_probe(dev, PTR_ERR(dpi->engine_clk), + "Failed to get engine clock\n"); dpi->pixel_clk = devm_clk_get(dev, "pixel"); - if (IS_ERR(dpi->pixel_clk)) { - ret = PTR_ERR(dpi->pixel_clk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "Failed to get pixel clock: %d\n", ret); - - return ret; - } + if (IS_ERR(dpi->pixel_clk)) + return dev_err_probe(dev, PTR_ERR(dpi->pixel_clk), + "Failed to get pixel clock\n"); dpi->tvd_clk = devm_clk_get(dev, "pll"); - if (IS_ERR(dpi->tvd_clk)) { - ret = PTR_ERR(dpi->tvd_clk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "Failed to get tvdpll clock: %d\n", ret); - - return ret; - } + if (IS_ERR(dpi->tvd_clk)) + return dev_err_probe(dev, PTR_ERR(dpi->tvd_clk), + "Failed to get tvdpll clock\n"); dpi->irq = platform_get_irq(pdev, 0); if (dpi->irq <= 0) @@ -1095,10 +1081,8 @@ static int mtk_dpi_probe(struct platform_device *pdev) return ret; ret = component_add(dev, &mtk_dpi_component_ops); - if (ret) { - dev_err(dev, "Failed to add component: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to add component.\n"); return 0; } From patchwork Wed Jul 19 07:50:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 122443 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2278251vqt; Wed, 19 Jul 2023 01:10:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlFj8bu6t1bE5XectunDOW3aNCa4njdRg+yYtbpEb8tw5TGwJX4bVxXmmgGJlO2B8Ltzvtj9 X-Received: by 2002:a05:6358:2817:b0:135:43da:b16d with SMTP id k23-20020a056358281700b0013543dab16dmr2637862rwb.11.1689754232117; Wed, 19 Jul 2023 01:10:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689754232; cv=none; d=google.com; s=arc-20160816; b=JDUYlqKUKrCn9QycOzaBEM9g7NxeaFs2rDhgUpUxAKsqPOs9j/4g3OID6Jyb2oYJBh 476jXuhDEyXBTSOcDKXDRKFltf/+V/LZRGPAZSoSwT7I712ob86eef5sUV80Wv7dL1O0 sWJd43K3F9t5CHMHMhEFcvFBeOWeul7Mra7+DrM2GSwB5WD1seBNRRhkLXXdWOX0t+0U YAjhLt7JRlCrnAYraU1xACBpZSU5JazXUKv860FBs2SYQBrE9AISV/vrirSf9ftXRJnn GgzrF621hE2HMfnKHfzXSolzoQTi0WSap57KunirwpqCyGdUB+Zm6x6d9+ferYGTS9Wk z7uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6JC4WWETfFfjGVtV1ifdQerYVvztYyLwFPiXgJNPrEM=; fh=NKnLsaTUs6DGQa/OThi18WPpEgJ637Y16FMWW8s0AeQ=; b=KgQQHOy0v79wN3K873KhvoJ/M3+fHystj25C7ieu1Tdm1rR33nosgrP8EKAfwcoCOL CBo1osrq99um/widuJQM6ENx8LhrXmtiR/g9jeihORhUMtWhD/OxuXGQhiEpnav0OqQk DPlEX5E3NA+I4jZZ8vpcARRPyMRyIoUe7rP+4KTXELpUlpWDGYANGWG8wMcg/qgRNCTR TxxRIbUqWGaJ7r2YyLB+oLOtGRYezPakP0VLofuFsYEPokcQXg4zZDh2E5mYYJU9Acpq /XL2/vECOh8WYxhpAlYpIJNFSlT8WFwh3R7vF7eq4mUycUCYn3aTCCbnzoi679QEUBgJ v0oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="DncmQ/aN"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d22-20020a63d656000000b0055b766191f4si3055245pgj.218.2023.07.19.01.10.17; Wed, 19 Jul 2023 01:10:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="DncmQ/aN"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230256AbjGSHvX (ORCPT + 99 others); Wed, 19 Jul 2023 03:51:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229957AbjGSHvK (ORCPT ); Wed, 19 Jul 2023 03:51:10 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29042134 for ; Wed, 19 Jul 2023 00:51:10 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 658B36607073; Wed, 19 Jul 2023 08:51:08 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1689753069; bh=P2asjJa8ZKRcMIUubSWXLd+81XU6yi5cTxDjeHRxCpI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DncmQ/aNBVXHlmrzBpAM82GdzdA2DMrDqjYopTIBEmYgyARJlFGvTn/Ime0aVDrCS 52fCG9RqqsAVUBD3ywVmGD7sW/FGzV3czEIuitOcXv26U7SzoKFCai/0u6jBxmqfPn druIeZpB2G5UHbaDrrwGd5ATTEsxWNL4Cik4OJkTjGHAE0b0YGZ9MSmqemTvSpeg6X E/wZf10fti0KN7uyVA5IYq5VgFSlcDBy+dqiZLtm0/qCx4kQddgc8tkdBlLvcdN/PD F/ZHy9JdaBKmzu2xQ/qQw0K94SpcW2KZIroHUd6ZgUGEMFugc1eQ45s2M8t/KE0RR8 kvCmRYPjBPBcA== From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, daniel@ffwll.ch, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, fshao@chromium.org Subject: [PATCH v2 3/6] drm/mediatek: mtk_dpi: Switch to devm_drm_of_get_bridge() Date: Wed, 19 Jul 2023 09:50:53 +0200 Message-Id: <20230719075056.72178-4-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> References: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771835733842072935 X-GMAIL-MSGID: 1771835733842072935 Function drm_of_find_panel_or_bridge() is marked as deprecated: since the usage of that in this driver exactly corresponds to the new function devm_drm_of_get_bridge(), switch to it. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Fei Shao --- drivers/gpu/drm/mediatek/mtk_dpi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 03a2b900bb50..e9c5a0f44537 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -1063,10 +1063,10 @@ static int mtk_dpi_probe(struct platform_device *pdev) if (dpi->irq <= 0) return -EINVAL; - ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, - NULL, &dpi->next_bridge); - if (ret) - return ret; + dpi->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0); + if (IS_ERR(dpi->next_bridge)) + return dev_err_probe(dev, PTR_ERR(dpi->next_bridge), + "Failed to get bridge\n"); dev_info(dev, "Found bridge node: %pOF\n", dpi->next_bridge->of_node); @@ -1089,8 +1089,6 @@ static int mtk_dpi_probe(struct platform_device *pdev) static int mtk_dpi_remove(struct platform_device *pdev) { - struct mtk_dpi *dpi = platform_get_drvdata(pdev); - component_del(&pdev->dev, &mtk_dpi_component_ops); return 0; From patchwork Wed Jul 19 07:50:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 122447 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2282109vqt; Wed, 19 Jul 2023 01:18:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlFAgq3/be4IkWWo9WPnloQzEYHgPvsn6qdc0EeNVbGdXv8du+2Lnzw1t9st61j0Kp1ExDXu X-Received: by 2002:a17:906:6a17:b0:992:ef60:ab0d with SMTP id qw23-20020a1709066a1700b00992ef60ab0dmr1754149ejc.69.1689754726762; Wed, 19 Jul 2023 01:18:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689754726; cv=none; d=google.com; s=arc-20160816; b=EX9Q+gi8AAs8Db/ei/CUzO32GRc9qse18sJlP81AQnd3UcR491u7xpIugDsT2UfN7v yDhZcRTyIBTnO10rQv7wYUO1nCM6IPa2a5Y1Kc6vcijTJH4y0ZomPjaFE2oYeuoT77uL 7O6bxkmY8ZChrBYds2/lSzTpmY4hKAI8ZQV9AHeerETNcNKwf2ugYEQ2wUVsLZJKtal3 iuTIH64kFngfoktZVwmj7J1fzOPcplslNbVaj0r2l/IxkKQhq2uXodM1870eZc7GYK4c zE9xV2ceLeEhR0B/q0H4JPjo6EMYDQysMS6Jxf4trxJ5D+gXpuZvitTV5DhVj70LL0pA /dsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BnhTI/F82CgPOVx1SlpJlEZGaZUaIbcTkTSKiCyKd/M=; fh=NKnLsaTUs6DGQa/OThi18WPpEgJ637Y16FMWW8s0AeQ=; b=tkXaE1NcOyWPcvuZXoEanTzIfySLwI4pQPdONxUbuoUcy3Z6URMV4z0g85uPauxCS8 Atm49p20772Q3W0oLyT35d0nupeOLFCAJ1oxAQbBI/dwQdicBKb+EnS2MUQ1kyHNYQ5E DaRkCKiKV7YEKytA4RkgVg9uK6ak3P2+wbN6rb8r8BkrteC6bGMf1OpNzell4F2ibdz8 m4WQvjtUwt/da3ob55kVYSM0hWyCSrPGrPkk93cOkW/NMmC19tybNtjR4r7bVikFdv9p UzSe/1yPpz/Bdg+wGMnnidbJ8e1xoYDbgElVWifPaMADmq9RlRo+RJ2+4sK7EmKOlB6K 0lKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=PKZwt9Y3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o6-20020a1709062e8600b00992d262fb29si2618172eji.992.2023.07.19.01.18.22; Wed, 19 Jul 2023 01:18:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=PKZwt9Y3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230273AbjGSHv1 (ORCPT + 99 others); Wed, 19 Jul 2023 03:51:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230006AbjGSHvL (ORCPT ); Wed, 19 Jul 2023 03:51:11 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E21BBE47 for ; Wed, 19 Jul 2023 00:51:10 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 2F6A16607072; Wed, 19 Jul 2023 08:51:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1689753069; bh=lw4Zkv3oS6GSkPKOSPEXOFTpN59kNOlACTF4/SJM4pY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PKZwt9Y3MCS4bZ3uTZssAD3AlKromVqKaRw/2gYboZ24CuR/b4gJ/3r995tND22qt yTbJS+cf5GkoR+y/b5VybefGocyes/d5UseDbgAG+6kmKpoEf1KKhH/ZjtfEnR9ZSJ mrRuZdYqTbYZZDqqXUdKIcMvPEiW09dwEBIaZAJJQgADK5CHD/p0MGvuz6Qlo+dwo0 UpA6YaBcF/Duh5MhqIP1Mr8kPUad2ERTBeI7YxUJvbipGCMYbYEhz6tu7dpKzvlqxQ hLXw+WX6jKkcly65ZCXs53OurQ4wNDeNXSupqKxl+esmLd2W0aCsjIfD2nVdkPtNVm YitujLBf8wMGg== From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, daniel@ffwll.ch, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, fshao@chromium.org Subject: [PATCH v2 4/6] drm/mediatek: mtk_dpi: Switch to .remove_new() void callback Date: Wed, 19 Jul 2023 09:50:54 +0200 Message-Id: <20230719075056.72178-5-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> References: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771836252035100472 X-GMAIL-MSGID: 1771836252035100472 The .remove() callback cannot fail: switch to .remove_new() and change mtk_dpi_remove() to void. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Fei Shao Reviewed-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_dpi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index e9c5a0f44537..3a140498c98a 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -1087,11 +1087,9 @@ static int mtk_dpi_probe(struct platform_device *pdev) return 0; } -static int mtk_dpi_remove(struct platform_device *pdev) +static void mtk_dpi_remove(struct platform_device *pdev) { component_del(&pdev->dev, &mtk_dpi_component_ops); - - return 0; } static const struct of_device_id mtk_dpi_of_ids[] = { @@ -1122,7 +1120,7 @@ MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids); struct platform_driver mtk_dpi_driver = { .probe = mtk_dpi_probe, - .remove = mtk_dpi_remove, + .remove_new = mtk_dpi_remove, .driver = { .name = "mediatek-dpi", .of_match_table = mtk_dpi_of_ids, From patchwork Wed Jul 19 07:50:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 122450 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2283592vqt; Wed, 19 Jul 2023 01:22:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlG+LY47XGDtXKv/v4H41UODRDqFMXbg/viIFWsyknDR/JfucKljDdQWFWRlsm5Yr4FMCq+L X-Received: by 2002:a17:906:53d6:b0:994:56d3:8a3d with SMTP id p22-20020a17090653d600b0099456d38a3dmr1735078ejo.17.1689754958946; Wed, 19 Jul 2023 01:22:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689754958; cv=none; d=google.com; s=arc-20160816; b=Afj5SIAxIf5bkoH7/kHbvQxrBHhI7JHtv94AhhniVxDpIARJ2UkMpZEzzhq2eL/NVs wxp4ONl/lMb9JmQynVP1tg3KVDdy1TmOgjfcS68GAd4H5vPgzesy75t2uo8qn4GNflJp KH2z1XW5Hy1aqkHCdWtV5MU8+wchFhraUJjmTb4WtitEF1vSbXwfkvr6usDjtCLE90m7 gK6K0ZdlJw2Vs1uG/mQR/pJUdnS+OkyGNSWILQo9e9jwRq5fFFB9x26LUiAVcSV9HG3q 3qaKIh4COuDqbbHjBm41CadMPnnSJIPdSQVCJ6sf/vZnzgWEYBX90cVTCWy4FWwA57Ct mLWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9A8cogseX/XHKwg6km5SEZXwcG9TMNwm3LxzDIr4lEA=; fh=NKnLsaTUs6DGQa/OThi18WPpEgJ637Y16FMWW8s0AeQ=; b=BWh+ZV3TZD12awBcbpYEymCTliHJo1Mtl6DWwTmQQwN6IWzcG+wF3RNIa48yEWBt7+ 1uFtpbzjuae2xHti692PVEgB8YBJNQM/GaRJOz/FQvF+0XVmsmV12tTxzp2WhL2IU9Vc slDWUcQ0IXGzhNZkDHHtszuP5gCTlmc8AUDF9/kobc20ZmoAgu7wpw2qsiTaLDbiX3Q5 g1bP0skV2l0EMIJDGID84urZTDSSCduxiBF9JVRmDDD3jYbMDDTi60eQGXYDMtuihUjt +eiMAP9fGlh1HSCKD4EgX03WjKBHW/rJAAlfwfEL25aY7FOIcDJM2Zkvx11b9IGf3LxT AEGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="C/tOVKwL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lc1-20020a170906dfe100b009930c0374basi2525066ejc.632.2023.07.19.01.22.14; Wed, 19 Jul 2023 01:22:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="C/tOVKwL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230283AbjGSHv3 (ORCPT + 99 others); Wed, 19 Jul 2023 03:51:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbjGSHvM (ORCPT ); Wed, 19 Jul 2023 03:51:12 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14A5F134 for ; Wed, 19 Jul 2023 00:51:12 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id F063B660704A; Wed, 19 Jul 2023 08:51:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1689753070; bh=pH0eS322JL8A9XQUDj4YhAVk0Kl3Mp/XP1arLmFs7pg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/tOVKwLVb7iMw6C/ZnKzmMECtfWtShZzz6LG2LIZ9x7CxakoAQLb+sQwYB1o2mYC C57V/Fq7TrgE7mZ0+XGT+oRM1DJS/UJKDOfyw6peF/PIF1f/1zfQsQjMFnU91XaruT Ge2/rx1bRHfY7YuGLeKI8E4tL4guS0+iNq8gZScOFQL0Wx95+vrcA6SjaWUJic/oBF qQYZRehZf9V76YKG+teySef8Imm5WIy9+TD0zt6iCcoKNMZ591qXe3OelZoCqsNzc3 4vlDIOF4IyYOBv6rYMKSTNGXr3JfutHrNDyKNWiS7BWB2DTLBlyr+QlG4ZAQZMGGiJ DNMXlA6ZXnvkg== From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, daniel@ffwll.ch, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, fshao@chromium.org Subject: [PATCH v2 5/6] drm/mediatek: mtk_dpi: Use devm_platform_ioremap_resource() Date: Wed, 19 Jul 2023 09:50:55 +0200 Message-Id: <20230719075056.72178-6-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> References: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771836496118661328 X-GMAIL-MSGID: 1771836496118661328 Instead of the open-coded platform_get_resource, devm_ioremap_resource switch to devm_platform_ioremap_resource(), also dropping the useless struct resource pointer, which becomes unused. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Fei Shao Reviewed-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_dpi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 3a140498c98a..244340df7468 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -1007,7 +1007,6 @@ static int mtk_dpi_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct mtk_dpi *dpi; - struct resource *mem; int ret; dpi = devm_kzalloc(dev, sizeof(*dpi), GFP_KERNEL); @@ -1038,8 +1037,7 @@ static int mtk_dpi_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "Cannot find pinctrl active!\n"); } } - mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - dpi->regs = devm_ioremap_resource(dev, mem); + dpi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(dpi->regs)) return dev_err_probe(dev, PTR_ERR(dpi->regs), "Failed to ioremap mem resource\n"); From patchwork Wed Jul 19 07:50:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 122456 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2290082vqt; Wed, 19 Jul 2023 01:39:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlFLQp1WDZVx4u6lvftfnOJvXaKw7bRX+V34iJ4HjylsSlVtrpQrCsZoSTDSyp1YOXyFXDsT X-Received: by 2002:a17:906:53d6:b0:994:56d3:8a3d with SMTP id p22-20020a17090653d600b0099456d38a3dmr1770251ejo.17.1689755981259; Wed, 19 Jul 2023 01:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689755981; cv=none; d=google.com; s=arc-20160816; b=rizakIVV5SgB/y6Ydxr+aGz/el13xvpfZ6TWjbRO2lpS/rSTKbq4zVZH/9hHhreGXe OAbN95UMPndLvtkZ5eoeSZdu5+ZQVr3eXy+2WUeMH4dYQP6WrNxzb2GdoA81xlAO8Oj2 Rm4TNaul9yWGj3nUFpNLKR3X390E8LOUsNo0McEA72injBlvgVg5jMiPDKTgy6BY0Vf3 DjMQFdX3cND8UYOXujnwZ0oAqVXrUQPYSiJd7y8yyz//k1U5T5eiDlNiMkhDtvDD1gLU 27vIev2e+r0jfjDvyhGZVoi2D/W4uSEI18n6ImfgVwNmRBxjqavjhYkB9BMu3RL5E9A1 q4tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aI8cJ9QuHC8O0uC8gYyun5z/ClKX85DGvEYkLKDualk=; fh=NKnLsaTUs6DGQa/OThi18WPpEgJ637Y16FMWW8s0AeQ=; b=pkGZys2UmnOK5W79M/9Dp7YX6UeKtZFICGkzPaH1S85EcM9POwrSZBtu9SAAJcHL3m z7Un8CEAR+48kUCXZXb2zW4LgJZnfwVdgDmz+zjtF9Cb7NG7W46bfOTN8vnngSlVf3A/ DDGDrDRT3VSvdTmRV7l5LyRC6e+lysn3ajcNbtEs011qZuzEv1upcFM+Yn59cOTOy2Ss hAWJ2e+pNuPyq0ptGuIKUzJvgvFh+mQ6lAnDGmEIEZDtJeEzC+0Vjf4LcFTd+KQuhJ0x O+oSjVBuTu+XCgA2rkix+uMIESHxLzI5QndbiNCkL7er7Vpp7wqU1ASAlRmFYfHOCofn D8lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=fNGCuNJz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ce8-20020a170906b24800b009930d9d6b4csi2531208ejb.888.2023.07.19.01.39.15; Wed, 19 Jul 2023 01:39:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=fNGCuNJz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230295AbjGSHvc (ORCPT + 99 others); Wed, 19 Jul 2023 03:51:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230040AbjGSHvN (ORCPT ); Wed, 19 Jul 2023 03:51:13 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97F721736 for ; Wed, 19 Jul 2023 00:51:12 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id BB3976607070; Wed, 19 Jul 2023 08:51:10 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1689753071; bh=njEiJKpcfz3CxTzbe9ovf4JbHnWi0lISeut4u5WR9b0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fNGCuNJzIqoBu7pmMvPVIs77YXhD/FXlxhrJydbQ4hyD8m0M86QcpWEx2cfnse0a9 sud3E5UINvYro4eEFEcOh8XHg+g04JqM5GsvbA6a3oZUu5dJjTaE89Cjx22kI6S0u6 NG3qBjQhDB3sH6pcs1/kNUV2mybd+ncj2AIAmnHMEyODk8g95X+/F1vNlNxK8zOSTy G+hhSF03G8OuY5WmdQl0S4hZVs+ib57XJrIXtGxecIqg4s44/TGgKb7CwwOaLFBzIr iaA6Cb2TJy+p75pWR48Tb6DTVcfOAPZ6LGnDxObn0Gt95qdrxt9uMf7RoCDNEJShDq 5Z+D5k63RbexA== From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, daniel@ffwll.ch, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, fshao@chromium.org Subject: [PATCH v2 6/6] drm/mediatek: mtk_dpi: Compress struct of_device_id entries Date: Wed, 19 Jul 2023 09:50:56 +0200 Message-Id: <20230719075056.72178-7-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> References: <20230719075056.72178-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771837567352083579 X-GMAIL-MSGID: 1771837567352083579 Reduce line count by compressing the entries of struct of_device_id; while at it, also add the usual /* sentinel */ comment to the last entry. This commit brings no functional changes. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Fei Shao Reviewed-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_dpi.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 244340df7468..ad1be4f9150c 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -1091,28 +1091,14 @@ static void mtk_dpi_remove(struct platform_device *pdev) } static const struct of_device_id mtk_dpi_of_ids[] = { - { .compatible = "mediatek,mt2701-dpi", - .data = &mt2701_conf, - }, - { .compatible = "mediatek,mt8173-dpi", - .data = &mt8173_conf, - }, - { .compatible = "mediatek,mt8183-dpi", - .data = &mt8183_conf, - }, - { .compatible = "mediatek,mt8186-dpi", - .data = &mt8186_conf, - }, - { .compatible = "mediatek,mt8188-dp-intf", - .data = &mt8188_dpintf_conf, - }, - { .compatible = "mediatek,mt8192-dpi", - .data = &mt8192_conf, - }, - { .compatible = "mediatek,mt8195-dp-intf", - .data = &mt8195_dpintf_conf, - }, - { }, + { .compatible = "mediatek,mt2701-dpi", .data = &mt2701_conf }, + { .compatible = "mediatek,mt8173-dpi", .data = &mt8173_conf }, + { .compatible = "mediatek,mt8183-dpi", .data = &mt8183_conf }, + { .compatible = "mediatek,mt8186-dpi", .data = &mt8186_conf }, + { .compatible = "mediatek,mt8188-dp-intf", .data = &mt8188_dpintf_conf }, + { .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf }, + { .compatible = "mediatek,mt8195-dp-intf", .data = &mt8195_dpintf_conf }, + { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);