From nobody Wed Dec 17 04:16:35 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0FB8D212D6A for ; Wed, 5 Feb 2025 20:10:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738786242; cv=none; b=JKNfMfbGvQy82QOc2yjBOfdvA6+tEWitkxR11eQ5gyAcVwVyiwQ1pIH2jXAKN8Ps0hUgtIFLiwhWKiYH4vgf90uP8GbhPXcky1JYR0r280TViUYgAXTdqDaTf/LPa5jE3t/dh8FvE664NooAEDlYmSJfMucvxuOpHTInVeYQ1/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738786242; c=relaxed/simple; bh=yFglEma1B1UrYHHlLaqVTTuVZsUxBAtaYu9Jp8rfq1E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Lf9McpUN0QSLSpEBmH2s70WHuVlsB52ctTm5zy4axOFRE+W0LsMb5sdK2pRKqdokm9k3alRotOLRg5eRh4FLm3hbwxr8FyotJYe3nH27ifRgZCuUWjtyj2rRWIorxfp6bs5jPgUzAYlyRnnQQ5X4g2YJaWRPN/Vko5eHCwbZ05E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=P+Re4ZOD; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P+Re4ZOD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738786240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5rXNc9RF+BTw1D+Lqt4cYonydXBV4cosBEfjWZVPn/Q=; b=P+Re4ZODHmhV933jIg3u3NSngKgWNT78Ww0o2RmmOO8zZVXWXvH6uEuoczB4yJFVaruYiW W48AQLjFZ/tZu9tuweqlKheD6XdaOQ/6jtiE+mdgguNd9l1vTKlrTCi7QTMSG6w27B0R7o mOs5o0bI8wqJP7Y9RIATo/rf5PAWt3Y= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-17-vmZibAKROxyKgLz1ZatC1A-1; Wed, 05 Feb 2025 15:10:36 -0500 X-MC-Unique: vmZibAKROxyKgLz1ZatC1A-1 X-Mimecast-MFC-AGG-ID: vmZibAKROxyKgLz1ZatC1A Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9A843180087E; Wed, 5 Feb 2025 20:10:35 +0000 (UTC) Received: from asrivats-na.rmtustx.csb (unknown [10.2.17.21]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4C0CB19560A3; Wed, 5 Feb 2025 20:10:25 +0000 (UTC) From: Anusha Srivatsa Date: Wed, 05 Feb 2025 15:08:03 -0500 Subject: [PATCH 07/12] drm/sti: move to devm_platform_ioremap_resource() usage Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250205-mem-cocci-newapi-v1-7-aebf2b0e2300@redhat.com> References: <20250205-mem-cocci-newapi-v1-0-aebf2b0e2300@redhat.com> In-Reply-To: <20250205-mem-cocci-newapi-v1-0-aebf2b0e2300@redhat.com> To: Joel Stanley , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrew Jeffery , Stefan Agner , Alison Wang , Xinliang Liu , Tian Tao , Xinwei Kong , Sumit Semwal , Yongqin Liu , John Stultz , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , AngeloGioacchino Del Regno , Marek Vasut , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Orson Zhai , Baolin Wang , Chunyan Zhang , Alain Volmat , Raphael Gallais-Pou , Yannick Fertre , Raphael Gallais-Pou , Philippe Cornu , Maxime Coquelin , Alexandre Torgue , Thierry Reding , Mikko Perttunen , Jonathan Hunter , Alexey Brodkin , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Jonathan Corbet Cc: linux-aspeed@lists.ozlabs.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, imx@lists.linux.dev, linux-rockchip@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-tegra@vger.kernel.org, linux-doc@vger.kernel.org, Anusha Srivatsa X-Developer-Signature: v=1; a=ed25519-sha256; t=1738786137; l=8138; i=asrivats@redhat.com; s=20250122; h=from:subject:message-id; bh=yFglEma1B1UrYHHlLaqVTTuVZsUxBAtaYu9Jp8rfq1E=; b=mAr/l77+MAM0Lk/wltquMSsQ+bAoBfxv2/A9dI4DccZHjP/taolYJP+a25CTaReWEHo2kZvFi CcKo9WqNUGJBrY3/6HPiO1DG3zjUFVNcaw9QNZGyybGqrtBiz9H9SEI X-Developer-Key: i=asrivats@redhat.com; a=ed25519; pk=brnIHkBsUZEhyW6Zyn0U92AeIZ1psws/q8VFbIkf1AU= X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Replace platform_get_resource/_byname + devm_ioremap with just devm_platform_ioremap_resource() Used Coccinelle to do this change. SmPl patch: @rule@ identifier res; expression ioremap; identifier pdev; constant mem; expression name; @@ -struct resource *res; ... -res =3D platform_get_resource_byname(pdev,mem,name); <... -if (!res) { -... -} ...> -ioremap =3D devm_ioremap(...); +ioremap =3D devm_platform_ioremap_resource_byname(pdev,name); and @rule_2@ identifier res; expression ioremap; identifier pdev; @@ -struct resource *res; ... -res =3D platform_get_resource(pdev,...); <... -if (!res) { -... -} ...> -ioremap =3D devm_ioremap(...); +ioremap =3D devm_platform_ioremap_resource(pdev,0); v2: Fix compilation error. Cc: Raphael Gallais-Pou Cc: Alain Volmat Signed-off-by: Anusha Srivatsa Acked-by: Raphael Gallais-Pou Reviewed-by: Maxime Ripard --- drivers/gpu/drm/sti/sti_compositor.c | 10 +--------- drivers/gpu/drm/sti/sti_dvo.c | 10 +--------- drivers/gpu/drm/sti/sti_hda.c | 9 +-------- drivers/gpu/drm/sti/sti_hdmi.c | 11 +---------- drivers/gpu/drm/sti/sti_hqvdp.c | 10 +--------- drivers/gpu/drm/sti/sti_tvout.c | 10 +--------- drivers/gpu/drm/sti/sti_vtg.c | 10 +--------- 7 files changed, 7 insertions(+), 63 deletions(-) diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti= _compositor.c index 063f82d23d80c4ba83624a0066a18416a2b37351..7aefce6706ba2cd7d97a33228c9= b9812edecf06f 100644 --- a/drivers/gpu/drm/sti/sti_compositor.c +++ b/drivers/gpu/drm/sti/sti_compositor.c @@ -177,7 +177,6 @@ static int sti_compositor_probe(struct platform_device = *pdev) struct device_node *np =3D dev->of_node; struct device_node *vtg_np; struct sti_compositor *compo; - struct resource *res; unsigned int i; =20 compo =3D devm_kzalloc(dev, sizeof(*compo), GFP_KERNEL); @@ -194,14 +193,7 @@ static int sti_compositor_probe(struct platform_device= *pdev) =20 memcpy(&compo->data, of_match_node(compositor_of_match, np)->data, sizeof(struct sti_compositor_data)); - - /* Get Memory ressources */ - res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (res =3D=3D NULL) { - DRM_ERROR("Get memory resource failed\n"); - return -ENXIO; - } - compo->regs =3D devm_ioremap(dev, res->start, resource_size(res)); + compo->regs =3D devm_platform_ioremap_resource(pdev, 0); if (compo->regs =3D=3D NULL) { DRM_ERROR("Register mapping failed\n"); return -ENXIO; diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c index c6c2abaa1891cd3ea025805b50d275ec314512c3..660588f01f90950a9b2c180ab23= 0188c19901f26 100644 --- a/drivers/gpu/drm/sti/sti_dvo.c +++ b/drivers/gpu/drm/sti/sti_dvo.c @@ -511,7 +511,6 @@ static int sti_dvo_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; struct sti_dvo *dvo; - struct resource *res; struct device_node *np =3D dev->of_node; =20 DRM_INFO("%s\n", __func__); @@ -523,14 +522,7 @@ static int sti_dvo_probe(struct platform_device *pdev) } =20 dvo->dev =3D pdev->dev; - - res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "dvo-reg"); - if (!res) { - DRM_ERROR("Invalid dvo resource\n"); - return -ENOMEM; - } - dvo->regs =3D devm_ioremap(dev, res->start, - resource_size(res)); + dvo->regs =3D devm_platform_ioremap_resource_byname(pdev, "dvo-reg"); if (!dvo->regs) return -ENOMEM; =20 diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c index b12863bea95559c4f874eb94cea8938609d435d4..0b5dbaf4d5305989846e25a1cab= 6f82d191aa9a5 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c @@ -750,14 +750,7 @@ static int sti_hda_probe(struct platform_device *pdev) return -ENOMEM; =20 hda->dev =3D pdev->dev; - - /* Get resources */ - res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "hda-reg"); - if (!res) { - DRM_ERROR("Invalid hda resource\n"); - return -ENOMEM; - } - hda->regs =3D devm_ioremap(dev, res->start, resource_size(res)); + hda->regs =3D devm_platform_ioremap_resource_byname(pdev, "hda-reg"); if (!hda->regs) return -ENOMEM; =20 diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index ca2fe17de4a5d1e0199e59a97e6c7601e139ed9e..666143c48b0d0f2c20cd26323dd= bc8e69d966622 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -1380,7 +1380,6 @@ static int sti_hdmi_probe(struct platform_device *pde= v) struct device *dev =3D &pdev->dev; struct sti_hdmi *hdmi; struct device_node *np =3D dev->of_node; - struct resource *res; struct device_node *ddc; int ret; =20 @@ -1399,15 +1398,7 @@ static int sti_hdmi_probe(struct platform_device *pd= ev) } =20 hdmi->dev =3D pdev->dev; - - /* Get resources */ - res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi-reg"); - if (!res) { - DRM_ERROR("Invalid hdmi resource\n"); - ret =3D -ENOMEM; - goto release_adapter; - } - hdmi->regs =3D devm_ioremap(dev, res->start, resource_size(res)); + hdmi->regs =3D devm_platform_ioremap_resource_byname(pdev, "hdmi-reg"); if (!hdmi->regs) { ret =3D -ENOMEM; goto release_adapter; diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvd= p.c index 0f658709c9d0d398c4eed65202443db9d0b41f8c..420395598d119a403d531211022= e6005d6a2bd59 100644 --- a/drivers/gpu/drm/sti/sti_hqvdp.c +++ b/drivers/gpu/drm/sti/sti_hqvdp.c @@ -1356,7 +1356,6 @@ static int sti_hqvdp_probe(struct platform_device *pd= ev) struct device *dev =3D &pdev->dev; struct device_node *vtg_np; struct sti_hqvdp *hqvdp; - struct resource *res; =20 DRM_DEBUG_DRIVER("\n"); =20 @@ -1367,14 +1366,7 @@ static int sti_hqvdp_probe(struct platform_device *p= dev) } =20 hqvdp->dev =3D dev; - - /* Get Memory resources */ - res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - DRM_ERROR("Get memory resource failed\n"); - return -ENXIO; - } - hqvdp->regs =3D devm_ioremap(dev, res->start, resource_size(res)); + hqvdp->regs =3D devm_platform_ioremap_resource(pdev, 0); if (!hqvdp->regs) { DRM_ERROR("Register mapping failed\n"); return -ENXIO; diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvou= t.c index af6c06f448c4819def8cc0d0836e30f991529690..0bebe815f5e7567f84388af9372= 3a6fa7d2cc7a2 100644 --- a/drivers/gpu/drm/sti/sti_tvout.c +++ b/drivers/gpu/drm/sti/sti_tvout.c @@ -838,7 +838,6 @@ static int sti_tvout_probe(struct platform_device *pdev) struct device *dev =3D &pdev->dev; struct device_node *node =3D dev->of_node; struct sti_tvout *tvout; - struct resource *res; =20 DRM_INFO("%s\n", __func__); =20 @@ -850,14 +849,7 @@ static int sti_tvout_probe(struct platform_device *pde= v) return -ENOMEM; =20 tvout->dev =3D dev; - - /* get memory resources */ - res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "tvout-reg"); - if (!res) { - DRM_ERROR("Invalid glue resource\n"); - return -ENOMEM; - } - tvout->regs =3D devm_ioremap(dev, res->start, resource_size(res)); + tvout->regs =3D devm_platform_ioremap_resource_byname(pdev, "tvout-reg"); if (!tvout->regs) return -ENOMEM; =20 diff --git a/drivers/gpu/drm/sti/sti_vtg.c b/drivers/gpu/drm/sti/sti_vtg.c index 5ba469b711b5318e9e9e6d8df127fb8933d1fac1..b5353fe774d72fd629ecd3ef75a= 5d2817ca8617f 100644 --- a/drivers/gpu/drm/sti/sti_vtg.c +++ b/drivers/gpu/drm/sti/sti_vtg.c @@ -380,20 +380,12 @@ static int vtg_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; struct sti_vtg *vtg; - struct resource *res; int ret; =20 vtg =3D devm_kzalloc(dev, sizeof(*vtg), GFP_KERNEL); if (!vtg) return -ENOMEM; - - /* Get Memory ressources */ - res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - DRM_ERROR("Get memory resource failed\n"); - return -ENOMEM; - } - vtg->regs =3D devm_ioremap(dev, res->start, resource_size(res)); + vtg->regs =3D devm_platform_ioremap_resource(pdev, 0); if (!vtg->regs) { DRM_ERROR("failed to remap I/O memory\n"); return -ENOMEM; --=20 2.47.0