From nobody Sat Jul 25 06:09:17 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 ADB003D891C for ; Thu, 16 Jul 2026 23:14:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784243657; cv=none; b=gTQpbcAzmSO1rxN0gbFjwkd8ZIq7DuswK2QthSydys9C4MKRH8KyN9uJITnljkLiWm6zhEjW3Z0HfJVSQSvcEFKyYOTVDKErdhMkH0ajvlcPSQv/QmVj9KCnNR4xlVgPFXL+R71xDaJoRCtZ+2Dzef/9lljylXDUKbuyxNEKQJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784243657; c=relaxed/simple; bh=u1lauwnzqGu846U7dPmC6XN+XAibMfUvyWar/SpcygU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=io+Mfib7XcsNL5F7SaXfnmyoqvRn09tPdPWXpu2YYpzKqzCqmiBJJrBnOee0MxcEhtu28OLo+Dk+gcybEyUFcWiipj+js4bdQZIZ+kL+XnBOB9ZJyxYi7DiL9fqDPikJB5fyghsDJThZmYzgXhyPgoGbjlZPZZQfZCo0oxTh6Eg= 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=BidBRyKY; arc=none smtp.client-ip=209.85.216.53 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="BidBRyKY" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-381ed661712so7474391a91.2 for ; Thu, 16 Jul 2026 16:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784243654; x=1784848454; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=dOT3Xr5HlD4/j+jQBz5vkm8ZOFN6tCVQYHYgeHCzw3g=; b=BidBRyKYLAlcgHkf5tgdaCJk+RvU/z0VS2WCfIrtjEHF3hiLBnDlo5mGmVaYweD435 zV0eWbGI+cdc9lMLG1jCBXriQ4GLeUNGji5cGqtcUdkW+SlH4o5V3gDDQ4fFyZeY+o0n NDD98TEHx2upZvn1cb2X+UUyEgmqJgV26mh59X6nY2LLTITqfoSc7KY5Nix+MsrKcV4j F23mAW4p8PHvcgUbeIgfzFU0x7huBo/c2S2A4Og9h3RhB6fjlPOmPkRz1dYS3u6vlYE8 JcHkmqJwpBE5BMh43CVmVVCq4d4MuJzItNCTTXbidH701VaJxEAad+eqvweZd1T4PKy9 ksNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784243654; x=1784848454; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=dOT3Xr5HlD4/j+jQBz5vkm8ZOFN6tCVQYHYgeHCzw3g=; b=pAumPvOQ3GnsmNJYGJC3y+NbtQ8b6InHpoS/tvji9sAfxywgcTvYmNtIqovexuNx+V C83MWkeZtLbSl4UgRLqxaQH8KL3zLIWXJD3ehaUk19l9XDEboYNrMLj2Q8tKAcYhr/a0 DXMGY9P6dIewdd6agcNZ1pGpcsntE9K5kGv9PKr5K1NgyMVLeZqZOFUldIx6eX5fumk/ mx/+D29WUQIAh+hHDsIq30zfykXzbDG3ZXCJtX7YleK96eMTiFdZd63cVqMpIQax7NnR tnUGhwNVWm6o6dsfFNZNu6Dy/rR5P6PV8rUpqqPyi6O1dlq3bxPsKr7XAwQR545o8iuX 8WnA== X-Forwarded-Encrypted: i=1; AHgh+Rqoi2UWy95o+HqqJUo61kKbxqNDFsv/i2nuXg36rpEmjuw/P3dPErIMR9n1hlzfwN9TjN3AzZi9UBGfgAo=@vger.kernel.org X-Gm-Message-State: AOJu0YyYzKMqjn2QNxG7RZVsItojUIb747T3kN14yta9yqbbkUzORMeq dbCfVgn/VtRhEJyTRh23CoPlNCj5mV6rGDc2ngHAEryWZt6xN/Bt/yQ3 X-Gm-Gg: AfdE7cnIjZ564mX/U9/stUguAVVBr4m2Odf2w9Rks5z/ug2DerxU5CQU6jsA2lJ+G2R DM2V7TdQ50H+sx8oEVdZZ/Pqem9oBJ+V+Xik5YK8dTsZn6b882+KOrMPZrAJKk0D61ZAOH88+/G 0jzsc/qu/MKrQJ1dgC03Y3rUPxu6zG2zFTrigZw8PERkcntzEAQQLO8Z9UyVMu91RBuRizeREfi mo99O7NpnDVvrRSqCP2mJtz5eqdRsDesWv3W1VxPcPFsKRkS4MFZ9d/d/7XI7jCLPw7Nq/nVoJd ZPMyvrlhCrxBd0yhmBQUcmtogQLPSUZMRbeCu4HTnkejpTS6CcshKtb0+bkFocncTp6RF3v92p2 9/tOA7aWcMvYpl8UD6VpLp1cqmuld+QJkrynY59Xyrqy8AM06kGVUU4utJIlkDYuvQHkyhcjLot RIvC2z3xguvRKMVv3o8Iq0DLzejxM4vZcAOXjyji+4y3zoMqgMbxQQQsxqnNEPvtfehNU0kA951 nTj3/8Hif40SpxOWkcWZi8GIzdzeWHjYPbss/Qvh/vz6RNjLETyEpTLT/IVfmDgAQ== X-Received: by 2002:a17:90b:4c0a:b0:37f:9ce1:7367 with SMTP id 98e67ed59e1d1-38e4b5455a7mr85129a91.29.1784243654033; Thu, 16 Jul 2026 16:14:14 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38e3a0d7a5bsm1979941a91.9.2026.07.16.16.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 16:14:13 -0700 (PDT) From: Rosen Penev To: linux-spi@vger.kernel.org Cc: Mark Brown , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2] spi: orion: use devm_clk_get_optional_enabled for axi clock Date: Thu, 16 Jul 2026 16:14:11 -0700 Message-ID: <20260716231411.1737001-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace the open-coded optional axi clock get/prepare/enable and the manual cleanup in probe/remove/runtime_resume with the managed helper devm_clk_get_optional_enabled(). This removes the now-unused out_rel_axi_clk error path and simplifies the clock lifecycle. Assisted-by: opencode:hy3-free Signed-off-by: Rosen Penev --- v2: remove unused variable drivers/spi/spi-orion.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c index 265708a94984..e5e05512a1fd 100644 --- a/drivers/spi/spi-orion.c +++ b/drivers/spi/spi-orion.c @@ -691,12 +691,9 @@ static int orion_spi_probe(struct platform_device *pde= v) return PTR_ERR(spi->clk); =20 /* The following clock is only used by some SoCs */ - spi->axi_clk =3D devm_clk_get(&pdev->dev, "axi"); - if (PTR_ERR(spi->axi_clk) =3D=3D -EPROBE_DEFER) - return -EPROBE_DEFER; - - if (!IS_ERR(spi->axi_clk)) - clk_prepare_enable(spi->axi_clk); + spi->axi_clk =3D devm_clk_get_optional_enabled(&pdev->dev, "axi"); + if (IS_ERR(spi->axi_clk)) + return PTR_ERR(spi->axi_clk); =20 tclk_hz =3D clk_get_rate(spi->clk); =20 @@ -719,10 +716,8 @@ static int orion_spi_probe(struct platform_device *pde= v) host->min_speed_hz =3D DIV_ROUND_UP(tclk_hz, devdata->max_divisor); =20 spi->base =3D devm_platform_get_and_ioremap_resource(pdev, 0, &r); - if (IS_ERR(spi->base)) { - status =3D PTR_ERR(spi->base); - goto out_rel_axi_clk; - } + if (IS_ERR(spi->base)) + return PTR_ERR(spi->base); =20 for_each_available_child_of_node(pdev->dev.of_node, np) { struct orion_direct_acc *dir_acc; @@ -757,9 +752,8 @@ static int orion_spi_probe(struct platform_device *pdev) dir_acc =3D &spi->child[cs].direct_access; dir_acc->vaddr =3D devm_ioremap(&pdev->dev, r->start, PAGE_SIZE); if (!dir_acc->vaddr) { - status =3D -ENOMEM; of_node_put(np); - goto out_rel_axi_clk; + return -ENOMEM; } dir_acc->size =3D PAGE_SIZE; =20 @@ -789,8 +783,6 @@ static int orion_spi_probe(struct platform_device *pdev) pm_runtime_put_noidle(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); -out_rel_axi_clk: - clk_disable_unprepare(spi->axi_clk); =20 return status; } @@ -799,12 +791,10 @@ static int orion_spi_probe(struct platform_device *pd= ev) static void orion_spi_remove(struct platform_device *pdev) { struct spi_controller *host =3D platform_get_drvdata(pdev); - struct orion_spi *spi =3D spi_controller_get_devdata(host); =20 spi_unregister_controller(host); =20 pm_runtime_get_sync(&pdev->dev); - clk_disable_unprepare(spi->axi_clk); =20 pm_runtime_disable(&pdev->dev); pm_runtime_put_noidle(&pdev->dev); @@ -830,8 +820,7 @@ static int orion_spi_runtime_resume(struct device *dev) struct spi_controller *host =3D dev_get_drvdata(dev); struct orion_spi *spi =3D spi_controller_get_devdata(host); =20 - if (!IS_ERR(spi->axi_clk)) - clk_prepare_enable(spi->axi_clk); + clk_prepare_enable(spi->axi_clk); return clk_prepare_enable(spi->clk); } #endif --=20 2.55.0