From nobody Fri Jul 24 22:51:45 2026 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1223D3B994A for ; Wed, 22 Jul 2026 12:09:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784722165; cv=none; b=sAySKXwo5yiS78Y2ZKb2TFCJuW8i4Gnc+bBcFqqUvuh3Zf5Rytb5y6VmsGYvWTu2x9Ohe1JBzLy/BMgruczPnYkUqYTXeGEL1p+w/UgMXO0wDhYLpnou21CbS2emEQRCb7/gd+t7iALc3tzMTDWclUoT6YF1tUWFTh2WpdMQNYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784722165; c=relaxed/simple; bh=c3pkZ4yaYJT5mT5XE0KdrjdNHM42/8KaKebxAgWgvPY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=Nm+sPXB+xr5OoNkzsayaYnR/EynCUe66I40UqlvAZwApA9eL5Q0BC/TOwHh6A0qsITbXpr6i0Cs1wSXe7t5H+WR3+0cv6hwHUT0FK7W40DcII0HpCoBkm3kuwQxaWANG5/5+1dIBWY3CFDRicmVQvMxzj1OW2l17YoBApNvpkDo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=br2qJjI5; arc=none smtp.client-ip=209.85.215.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="br2qJjI5" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-ca00f126b7eso8563138a12.2 for ; Wed, 22 Jul 2026 05:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784722161; x=1785326961; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=JnCZkgkGfZi2Ykzq8Jw5LKRVV2duYzk4jC1BEsMVF60=; b=br2qJjI5bpKx1mb/2jg6BxHDlIiq5J26TQB/bzGo44h/KcZYRUoaCJB/V6W5SlHfUw Iu4nmNRDpbfocM4VSHNz3qKpqdMOGuexO+Oy52uPuWT7yqfgcWQkEuijaitVL5QIc1YT RV+DY4ctxFZA5QaMTsetga9/ad0Ppr4a+1vgYSHKCfCn/TmVDYhzDclwq6KGPJgWKGSm iJdesuHePbyEXz2tHjW/jxfsR6/3If7LVqsAzZgMG4dc+NUDTd3iKG0MjIsaezpBzVDy iR4yE0K9ISLvs0gyj5qw8zsagI2IdJ9rIILm31WgZL67o42CG49PQtfyhN9nW9nkzYT7 F0xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784722161; x=1785326961; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=JnCZkgkGfZi2Ykzq8Jw5LKRVV2duYzk4jC1BEsMVF60=; b=Q3bFJUiknyydXaAFEP+YF+4mS1GUK1obm9kjMOur3+KrWf/CsTRXC6sQkJllz3AzTo k3CPuPB/6exTofA3eQnFKEPMHeummGUmgAIMnufiDYHcY8uD2Sz/qR8rOBfL6+VqbflS 6NH6A3gukm4zQ/7v128sNneYil0FHsqlKPHuRzOUuDkdfozoJkpsjo1IGizykKv3Hwss 2ANeo0/5mZLcZJplUKvvxPX7016AnRX6j3ncrkjLuGD5egMI/pVNCNiWXAJ1re4yCtED 2S5rUeLwV7s+1fhdeDvov5AhqUBo/l+XHM3qv0TDmaM+55x1c2fg19EIemGg2UPxgBRs sXAw== X-Forwarded-Encrypted: i=1; AHgh+RqjZL5iwFE81sVhsBggUKRre/pGpRyn1XoxTVoWJjKZMpJ+R6+gfB++uXndXfmEPzXTD5+UwMjKL+HQUgY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5St9X3HGQV1FqTINSohn4P7DVAKlw8nZTNkZryYj1GBUl3SVZ FKZMY8cD+E9LLn6eNmfmEolxJS7dcbO4tsMQMM7gRh+mcvoMxQ7IOavIwOIibIuz X-Gm-Gg: AR+sD13x0aWIgnLmgOW1FTenPMml40dVVPS8JRCZAOJOHfRdVkIXIBoGMLSQJkEDaZ1 jnOaZ0B+aJRBouKJaVLIW0EEw6CTxIL3k2aUZb/lx29+cfEJTQtGiUIcQfoWOzSjkEwjaaQ9w9i 8svdX6PbDa/Qx5U9KDkNAw50VYaWrrt4fw6/ejk81U/jbl0wx2+w+0Wx5QHGUjA6wk4TXvWCxND hC0sJPLgsmIqtnTOvCtxU1Wk+v4z5trrBRHtOeMHfUJcquJvEINRSw8c3PTUmS8liDdN29psv/l dbJa2p5fdzuIBRR9DT+yXXnS9IjCMrqVcdgTy3GyqVU4fO4i8bPKIuWIBLi5s1cRsfycQU/de/o kyA6YOWuQm6lHcpRrLGAGSEwnE+/kvb/kEF7BHGDLAQaXx/GhBfk7jy8YcpxlesNvD3daV1mP9R lGejPUsuVcqu+zq1/M/2pFmp79M/+4t+rNTG2mkmNfsV4MDF0MXma2l1uGvd2rGazcgaoVrw== X-Received: by 2002:a05:6a00:3c92:b0:846:bc81:3e29 with SMTP id d2e1a72fcca58-84c29305401mr23707166b3a.2.1784722161238; Wed, 22 Jul 2026 05:09:21 -0700 (PDT) Received: from junjungu-PC.localdomain ([223.166.246.74]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84e17286798sm1200884b3a.23.2026.07.22.05.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 05:09:20 -0700 (PDT) From: Felix Gu Date: Wed, 22 Jul 2026 20:09:17 +0800 Subject: [PATCH] spi: meson-spifc: use devm_pm_runtime_set_active_enabled 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: <20260722-spifc-v1-1-e4462a4c6a06@gmail.com> X-B4-Tracking: v=1; b=H4sIAOyyYGoC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIzMDcyMj3eKCzLRkXWNjs7SklFRLU0PDJCWg2oKi1LTMCrA50bEQfnFpUlZ qcglIs1JtLQBIqdjmaQAAAA== X-Change-ID: 20260722-spifc-336fbde9511b To: Mark Brown , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Felix Gu X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784722159; l=1841; i=ustc.gu@gmail.com; h=from:subject:message-id; bh=c3pkZ4yaYJT5mT5XE0KdrjdNHM42/8KaKebxAgWgvPY=; b=LoDm1A0vxhBozG2ZbQAhtbUdmBpLnVMM36EGCfhoSXvay3NCvKqH10RJPwYb3BAxDUP0e9oA9 12dhC8v+Fz+DGwjb2Oc++chA1I4nvnKvYojwuuCva2XpeIw0bXba4yQ X-Developer-Key: i=ustc.gu@gmail.com; a=ed25519; pk=fjUXwmjchVN7Ja6KGP55IXOzFeCl9edaHoQIEUA+/hw= Use devm_pm_runtime_set_active_enabled to replace pm_runtime_set_active() + pm_runtime_enable() and drop the out_pm error label and now-unnecessary remove function. Signed-off-by: Felix Gu --- drivers/spi/spi-meson-spifc.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/drivers/spi/spi-meson-spifc.c b/drivers/spi/spi-meson-spifc.c index e36aa94bbdae..f67a0d10b602 100644 --- a/drivers/spi/spi-meson-spifc.c +++ b/drivers/spi/spi-meson-spifc.c @@ -325,27 +325,15 @@ static int meson_spifc_probe(struct platform_device *= pdev) =20 meson_spifc_hw_init(spifc); =20 - pm_runtime_set_active(spifc->dev); - pm_runtime_enable(spifc->dev); + ret =3D devm_pm_runtime_set_active_enabled(spifc->dev); + if (ret) + return dev_err_probe(spifc->dev, ret, "failed to set runtime PM\n"); =20 ret =3D devm_spi_register_controller(spifc->dev, host); - if (ret) { - dev_err(spifc->dev, "failed to register spi host\n"); - goto out_pm; - } + if (ret) + return dev_err_probe(spifc->dev, ret, "failed to register spi host\n"); =20 return 0; -out_pm: - pm_runtime_disable(spifc->dev); - - return ret; -} - -static void meson_spifc_remove(struct platform_device *pdev) -{ - pm_runtime_get_sync(&pdev->dev); - pm_runtime_disable(&pdev->dev); - pm_runtime_put_noidle(&pdev->dev); } =20 #ifdef CONFIG_PM_SLEEP @@ -423,7 +411,6 @@ MODULE_DEVICE_TABLE(of, meson_spifc_dt_match); =20 static struct platform_driver meson_spifc_driver =3D { .probe =3D meson_spifc_probe, - .remove =3D meson_spifc_remove, .driver =3D { .name =3D "meson-spifc", .of_match_table =3D of_match_ptr(meson_spifc_dt_match), --- base-commit: 3fe08b9796f36ef437ab9328e7dd1e5ff2d66603 change-id: 20260722-spifc-336fbde9511b Best regards, -- =20 Felix Gu