From nobody Tue Feb 10 01:31:33 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1C3CF363C5E; Thu, 29 Jan 2026 21:43:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769723006; cv=none; b=UofWDBKoPQ5Pwx4b2/KoudQrh76obiR22qAeH1bNJsWfeXcvAxMI1ACDF/1Uyq9JYVrlF0WDeNZrOuob/woSEQrxJ6fyOHJ9qBn1GzVdqx7wMvoR2tqSRDYyc0SpqG8C9jRy3Ba9+0Kvp+pzTqwn7c/LA42aHwL6qR2oste1vcQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769723006; c=relaxed/simple; bh=brx5w1sBoP4rgYEbfgYXX3fyk016qy1FYk3BSETc+Z8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EJ13GHPdhZNzJmOhqgHJCIcQO8HD/+JTXq2E+dxq5C6VDOjf8iGZHH2Id7LSAWnJZsm05vq6CpSsIbmZUWU5q5IbK01qY0fx9VY8mctES4I/shKy8FbOFi4RoH7mHN1jrlDp6st0ljiOTXxPYO5S22Mp4GR36tP1qUGmCpREMvM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CLViJ3O8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CLViJ3O8" Received: by smtp.kernel.org (Postfix) with ESMTPS id CCED8C19425; Thu, 29 Jan 2026 21:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769723005; bh=brx5w1sBoP4rgYEbfgYXX3fyk016qy1FYk3BSETc+Z8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=CLViJ3O8BuTJDeerrtus6D+JUA5jjUQ/kVFC44PsLzZN9DghX1D0NslbVHS9OesJR 9Zg518kHU2EZREGg4KnHpazEkys45FUgujXTRT2nzQ6QFMQvCwSqsymahxxneMKjIz FOD8rD9SUrPaB2q+snlbZbI7V/U13oKMsd+875H5oJgefRxV1Zm/jes5Tmd/KZCVOa Q7QprnNZZWy6JrIgEg7Z6uNCubtG/PijoRcQ/HTSUDI5glgcoLtb9ASxeKNs4sd4O3 Yb0FLDM0Uuy8/2+0PFhWp3DYTPQf8gTpq3lzlMp0ZnExnIzsaPSwu33F+Fiu6IsRgP ILu9bjs2akP+A== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBA09D73E9E; Thu, 29 Jan 2026 21:43:25 +0000 (UTC) From: Abdurrahman Hussain via B4 Relay Date: Thu, 29 Jan 2026 21:43:14 +0000 Subject: [PATCH v7 2/6] i2c: xiic: switch to devres managed APIs 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: <20260129-i2c-xiic-v7-2-727e434897ef@nexthop.ai> References: <20260129-i2c-xiic-v7-0-727e434897ef@nexthop.ai> In-Reply-To: <20260129-i2c-xiic-v7-0-727e434897ef@nexthop.ai> To: Michal Simek , Andi Shyti , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Andy Shevchenko , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Abdurrahman Hussain X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1769723005; l=2599; i=abdurrahman@nexthop.ai; s=20260119; h=from:subject:message-id; bh=zykN6ZbMH9Nn+LViqCFPQScoNBhSq6F1OqapwVemGvw=; b=zZpDJ7/w7XL3qTy2Z5St/mPn622Dpk7ZY0mmDnZ0wNVsVuRjmUCJkuz6rpxNaaTQi0xuqpAiv ND5S89Q0NlvCkscEhooEHlZYXxQtsN2mujwJGv7F1lWvbIne90QrRFn X-Developer-Key: i=abdurrahman@nexthop.ai; a=ed25519; pk=S+ysnf+NwMcBdHBlyKIUEAtaFGSIhQwcJcgcXhq0osg= X-Endpoint-Received: by B4 Relay for abdurrahman@nexthop.ai/20260119 with auth_id=608 X-Original-From: Abdurrahman Hussain Reply-To: abdurrahman@nexthop.ai From: Abdurrahman Hussain Simplify the error code paths by switching to devres managed helper functions. Signed-off-by: Abdurrahman Hussain Reviewed-by: Andy Shevchenko --- drivers/i2c/busses/i2c-xiic.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index 912a94d4d080..a480cbb86d93 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c @@ -1462,7 +1462,10 @@ static int xiic_i2c_probe(struct platform_device *pd= ev) snprintf(i2c->adap.name, sizeof(i2c->adap.name), DRIVER_NAME " %s", pdev->name); =20 - mutex_init(&i2c->lock); + ret =3D devm_mutex_init(dev, &i2c->lock); + if (ret) + return ret; + spin_lock_init(&i2c->atomic_lock); =20 if (is_of_node(dev->fwnode)) { @@ -1475,8 +1478,9 @@ static int xiic_i2c_probe(struct platform_device *pde= v) i2c->dev =3D &pdev->dev; pm_runtime_set_autosuspend_delay(i2c->dev, XIIC_PM_TIMEOUT); pm_runtime_use_autosuspend(i2c->dev); - pm_runtime_set_active(i2c->dev); - pm_runtime_enable(i2c->dev); + ret =3D devm_pm_runtime_set_active_enabled(dev); + if (ret) + return ret; =20 /* SCL frequency configuration */ i2c->input_clk =3D clk_get_rate(i2c->clk); @@ -1492,7 +1496,7 @@ static int xiic_i2c_probe(struct platform_device *pde= v) =20 if (ret < 0) { dev_err_probe(&pdev->dev, ret, "Cannot claim IRQ\n"); - goto err_pm_disable; + return ret; } =20 i2c->singlemaster =3D @@ -1511,16 +1515,14 @@ static int xiic_i2c_probe(struct platform_device *p= dev) i2c->endianness =3D BIG; =20 ret =3D xiic_reinit(i2c); - if (ret < 0) { - dev_err_probe(&pdev->dev, ret, "Cannot xiic_reinit\n"); - goto err_pm_disable; - } + if (ret) + return dev_err_probe(dev, ret, "Cannot xiic_reinit\n"); =20 /* add i2c adapter to i2c tree */ ret =3D i2c_add_adapter(&i2c->adap); if (ret) { xiic_deinit(i2c); - goto err_pm_disable; + return ret; } =20 if (pdata) { @@ -1532,12 +1534,6 @@ static int xiic_i2c_probe(struct platform_device *pd= ev) dev_dbg(&pdev->dev, "mmio %08lx irq %d scl clock frequency %d\n", (unsigned long)res->start, irq, i2c->i2c_clk); =20 - return 0; - -err_pm_disable: - pm_runtime_disable(&pdev->dev); - pm_runtime_set_suspended(&pdev->dev); - return ret; } =20 @@ -1558,8 +1554,6 @@ static void xiic_i2c_remove(struct platform_device *p= dev) xiic_deinit(i2c); =20 pm_runtime_put_sync(i2c->dev); - pm_runtime_disable(&pdev->dev); - pm_runtime_set_suspended(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); } =20 --=20 2.52.0