From nobody Thu Apr 9 13:27:32 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 E85B429BD9A for ; Sun, 8 Mar 2026 13:35:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772976903; cv=none; b=m8JK2oTn9ogAtSWxOFBX0Ubfb3Dd8LskWGJ/50rQr6BN+dyk9AEPfiZvnXDW7RLkcX6ZCj1qo0WYuKrJYOuf+IFNpKkOoRDa/zqzy79LktUAxeoaqEzNx5pSyW5P7ZdvrmEslOk5ztmzLvIDl2m0TE/XGoNPdQSRzwdifn6km7Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772976903; c=relaxed/simple; bh=IdkYZcqSAsfDr/v01fcZng8MKVvKs612Vz+/y2dFwAw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=hG6+6HKxfg9Ve3aeKNNgLilCTlRXYfRBx7STFslqZRUgQpDcgNjm/tt2QfNBWSLlrxYNl9H/ohf87ZdnJtsPs35MA4Wq1WGW60kwNws/c7oup2p8cO/Rev+wjUeaIzxlSDddeJufG6pU4gvbrVOCxpSGOE9XMiXi928+VHa03QY= 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=eMCjaptE; arc=none smtp.client-ip=209.85.210.173 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="eMCjaptE" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-829ac4670c4so1236398b3a.0 for ; Sun, 08 Mar 2026 06:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772976901; x=1773581701; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=JltE6+8Ow4XXeaqmNG/IJKeoUqa+n358vgCzVseFfy4=; b=eMCjaptEfWwLFBwnK5ob5bYSNiyCW6XIbjpLWi/Lnv80o9e+ykuZ59eg1e1MXcZEWA ObG31TEpjkV5vTwPeQRGXikKEqC2ZABEzvBcAsf6bz2IUJG3nyJPduvEaSn7/dSQdUfP 6z28/OXe0v+eXORpalEnVLnesgbSvIi792Jngmya+qyktODSTzLwhxZ33OL18z6piEfb gFaZKYzPBnWfqN5SFnSsJiUIk5g95H0iJPA59TG6v6mpm0tv6adAYgHAh2+oDRX6Z7j4 JUeZ8ML6UJ9Lf2Fe8/LOkhHtWjCnmIsyib8LOD2WX4qohgsxHFvkFmGRssI7XrBAzJ+y 6eOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772976901; x=1773581701; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JltE6+8Ow4XXeaqmNG/IJKeoUqa+n358vgCzVseFfy4=; b=L6fcwssDu2wUQfjWxp9UNSPIkr2l1UUR08/XGoDABpAgNRq/CCTkDWKnRhCinFG7sc 6gTIhKouJi34ZhoAU6CqZOQspZP829JwMWk5kzuFLCtb86MA20cZ0E2oFvaRPdfJZMt6 L2TL4bgs7n+ATPkM/j1VKfNRJYBlBUtnjj03rrLclmmX8y79FcUmMfWaSlJfYja48jNa 3J965cPcgZDNKgH2xvwdD3tqp5JieI5UEK/xrHebqS6ruWTwDWfoLSsDHeb3tx3oC8qf BVoMlhVsbFoGaQ6riCvdTLZk/JkVElcRP8Dw/rugrXoF6BJnPFmAOovkpkCsilBd7hfI PfVg== X-Forwarded-Encrypted: i=1; AJvYcCWYBCfbs7pIEVsXAaqPJ1nZ4kTg0Whr4JLVuOpzHbjCZ82rAMSPsMAkR2CZVxr17Xjmm7R7dxNqUEb2CwA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw02bVQSK17fASr+rSqCwKGQ8mA/SP1LiR4PSrfxc21A3MKW6ih y8kzP+a7h8lmF02Cck4ye4vPh1AqmBLrwBGSv0uqgRPwv1efB4IPRoghLMyG3e2d X-Gm-Gg: ATEYQzwhp/tf62axQYphowfFpK5ZPX7LZ0ubwze7OJb5XoSM8YmvonByZ91YT4S4dzL vNy+Se9IVpEi8l0osdif+oZiM23UJD5p5fVqKnVSOQ6CBD173Pz4Xrl8VXgOdDP0YU9RJ8WhFZb vI75ubjSQVqyOj7mbSWvMncONSfDbnUoGpSzUeV7S2FPOtl0XcS7tgNHa9IV9INkVDH4cNde62p qJDPgBsO0/SiIKLWb2P0kVT314REVas7+Orp94w9ewG+cNHaztz11Wm8GowGXSAuImG2ghk9yKf c0FLUDpb9s35umFsEU02J2hrz02aiM3WOH3merLCzqlvzE8zbUEuyDi2Ge9AqXE1hE3qB4mTAB1 MwDZMu4VkVpo4HGcs4y88MCYMO8vrkukyfgpEtRQZhxCiOTQ0eELQMs+1SprBRsxr/k6YNLibMz nU6dOyGwu7VFGRANfzAU7WC/FLwE4kLYfnk8Gv X-Received: by 2002:a05:6a00:1c87:b0:824:374a:1424 with SMTP id d2e1a72fcca58-829a2f699dbmr7046957b3a.58.1772976901013; Sun, 08 Mar 2026 06:35:01 -0700 (PDT) Received: from junjungu-PC.localdomain ([2408:820c:9009:3f2:4507:7fb4:bc3a:eca9]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829a48d696bsm6895996b3a.58.2026.03.08.06.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Mar 2026 06:35:00 -0700 (PDT) From: Felix Gu Date: Sun, 08 Mar 2026 21:34:55 +0800 Subject: [PATCH] spi: amlogic: spifc-a4: Remove redundant clock cleanup 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: <20260308-spifc-a4-1-v1-1-77e286c26832@gmail.com> X-B4-Tracking: v=1; b=H4sIAP56rWkC/x3MQQqAIBBA0avIrBtQC5GuEi3MZmo2JgoRSHdPW r7F/w0qFaEKs2pQ6JYqV+owg4J4hnQQyt4NVlunR+2xZuGIYUKDzjNvxrnAzNCDXIjl+WfL+r4 fJLtx3FwAAAA= X-Change-ID: 20260308-spifc-a4-1-68ffb166afff To: Liang Yang , Feng Chen , Xianwei Zhao , Mark Brown Cc: linux-amlogic@lists.infradead.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Gu X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772976897; l=3322; i=ustc.gu@gmail.com; h=from:subject:message-id; bh=IdkYZcqSAsfDr/v01fcZng8MKVvKs612Vz+/y2dFwAw=; b=ZfSJgryJPy5aIsot/eh+rHeNfAWOTkrwIbpOT+IyH6Dk59HdDBzl90AJrxWPOzvfYj5ChX+9G NRb8Zp5gGxUD17R8GomZSUGQhE3vo+0fTosH2TwvmNc8b76FJ2UE1KA X-Developer-Key: i=ustc.gu@gmail.com; a=ed25519; pk=fjUXwmjchVN7Ja6KGP55IXOzFeCl9edaHoQIEUA+/hw= The driver uses devm_clk_get_enabled() which enables the clock and registers a callback to automatically disable it when the device is unbound. Remove the redundant aml_sfc_disable_clk() call in the error paths and remove callback. Fixes: 4670db6f32e9 ("spi: amlogic: add driver for Amlogic SPI Flash Contro= ller") Signed-off-by: Felix Gu --- drivers/spi/spi-amlogic-spifc-a4.c | 46 ++++++----------------------------= ---- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/drivers/spi/spi-amlogic-spifc-a4.c b/drivers/spi/spi-amlogic-s= pifc-a4.c index 2aef528cfc1b..d3061c870ff8 100644 --- a/drivers/spi/spi-amlogic-spifc-a4.c +++ b/drivers/spi/spi-amlogic-spifc-a4.c @@ -1084,14 +1084,6 @@ static int aml_sfc_clk_init(struct aml_sfc *sfc) return clk_set_rate(sfc->core_clk, SFC_BUS_DEFAULT_CLK); } =20 -static int aml_sfc_disable_clk(struct aml_sfc *sfc) -{ - clk_disable_unprepare(sfc->core_clk); - clk_disable_unprepare(sfc->gate_clk); - - return 0; -} - static int aml_sfc_probe(struct platform_device *pdev) { struct device_node *np =3D pdev->dev.of_node; @@ -1142,16 +1134,12 @@ static int aml_sfc_probe(struct platform_device *pd= ev) =20 /* Enable Amlogic flash controller spi mode */ ret =3D regmap_write(sfc->regmap_base, SFC_SPI_CFG, SPI_MODE_EN); - if (ret) { - dev_err(dev, "failed to enable SPI mode\n"); - goto err_out; - } + if (ret) + return dev_err_probe(dev, ret, "failed to enable SPI mode\n"); =20 ret =3D dma_set_mask(sfc->dev, DMA_BIT_MASK(32)); - if (ret) { - dev_err(sfc->dev, "failed to set dma mask\n"); - goto err_out; - } + if (ret) + return dev_err_probe(sfc->dev, ret, "failed to set dma mask\n"); =20 sfc->ecc_eng.dev =3D &pdev->dev; sfc->ecc_eng.integration =3D NAND_ECC_ENGINE_INTEGRATION_PIPELINED; @@ -1159,10 +1147,8 @@ static int aml_sfc_probe(struct platform_device *pde= v) sfc->ecc_eng.priv =3D sfc; =20 ret =3D nand_ecc_register_on_host_hw_engine(&sfc->ecc_eng); - if (ret) { - dev_err(&pdev->dev, "failed to register Aml host ecc engine.\n"); - goto err_out; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, "failed to register Aml host ecc e= ngine.\n"); =20 ret =3D of_property_read_u32(np, "amlogic,rx-adj", &val); if (!ret) @@ -1178,24 +1164,7 @@ static int aml_sfc_probe(struct platform_device *pde= v) ctrl->min_speed_hz =3D SFC_MIN_FREQUENCY; ctrl->num_chipselect =3D SFC_MAX_CS_NUM; =20 - ret =3D devm_spi_register_controller(dev, ctrl); - if (ret) - goto err_out; - - return 0; - -err_out: - aml_sfc_disable_clk(sfc); - - return ret; -} - -static void aml_sfc_remove(struct platform_device *pdev) -{ - struct spi_controller *ctlr =3D platform_get_drvdata(pdev); - struct aml_sfc *sfc =3D spi_controller_get_devdata(ctlr); - - aml_sfc_disable_clk(sfc); + return devm_spi_register_controller(dev, ctrl); } =20 static const struct of_device_id aml_sfc_of_match[] =3D { @@ -1213,7 +1182,6 @@ static struct platform_driver aml_sfc_driver =3D { .of_match_table =3D aml_sfc_of_match, }, .probe =3D aml_sfc_probe, - .remove =3D aml_sfc_remove, }; module_platform_driver(aml_sfc_driver); =20 --- base-commit: a0ae2a256046c0c5d3778d1a194ff2e171f16e5f change-id: 20260308-spifc-a4-1-68ffb166afff Best regards, --=20 Felix Gu