From mboxrd@z Thu Jan 1 00:00:00 1970 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 B72DD3A545F; Tue, 5 May 2026 11:46:02 +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=1777981562; cv=none; b=fLRGpnN1Gd9pV9IZIKlzFvLFi7BQQhEnPvXkn04Yc5O6gjneFMfGfbicJpg+IjgDGYjxmWzS7Ot0yNbjcHJMHoWfCjtP+3aXn0HdFArLfN26WaPcnYMg5nAOflbRtdiBFh5L/GkhPvV/kZJPMN0iOHT4jEoHFeoryoJn+Tv9j10= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777981562; c=relaxed/simple; bh=OYLRKn4vbj+SBx2isq71Gqq202dPeBmD9CR9r4Nte4k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KWTzCyK9ZmWH5r8jIaWxCVXtUlpVVOohu5rhWxNZ6AgP0i+uV4IYHV4HmhOC5wFix5SuMaP3D6yQblYmcr0z/NQJitAWCUMyl5q/XBNUJpe6MT8g4jVU0/DGUpTe1uVIC35VibAWCxSWMuFKvSEuhZ1TVNZr+TjF7lst0pW/mVo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X/zi/wpQ; 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="X/zi/wpQ" Received: by smtp.kernel.org (Postfix) with ESMTPS id 88A43C4AF0B; Tue, 5 May 2026 11:46:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777981562; bh=OYLRKn4vbj+SBx2isq71Gqq202dPeBmD9CR9r4Nte4k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=X/zi/wpQnEBp91Ggr5+PXaNI6bVoXGTgr7lFWQ6GDLEQS5PSHEIWUvLYD5AcuROnK /6wHRqi0dnB3HIGuG5EJB7lTHeKkMECP5RAX29xu7nym8aVrrv6xgkOFaYPXeMXuc2 0uStfdsNcOR+QfOwRZDU7fcLCFguonT3iFcjr7N4PjNdc/vSCFH+K7LY/0imslQbaG dtoAhTRR0DqG4IEquj+DmWUs41x1Py+8xMyaFbE9haspe79q+YusBsJTrNC3Vtp+VA R3CsvzUjFFMnSh6sm9+0alNicK9LkuA0qYFQ7/W3SXYBuoMDxFzopvp+G55ZTgDRxy FYHAYk61+Ci3g== 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 7A407CD343E; Tue, 5 May 2026 11:46:02 +0000 (UTC) From: Joshua Crofts via B4 Relay Date: Tue, 05 May 2026 13:46:10 +0200 Subject: [PATCH v5 14/18] iio: magnetometer: ak8975: switch to using managed resources 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: 7bit Message-Id: <20260505-magnetometer-fixes-v5-14-831b9b5550fc@gmail.com> References: <20260505-magnetometer-fixes-v5-0-831b9b5550fc@gmail.com> In-Reply-To: <20260505-magnetometer-fixes-v5-0-831b9b5550fc@gmail.com> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Joshua Crofts , Andy Shevchenko X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777981558; l=4896; i=joshua.crofts1@gmail.com; s=20260422; h=from:subject:message-id; bh=+GB+FsZGH67OE5uz28cNhIr2N9StqeThAUxU0HlP7Cg=; b=/n3oWfmRrTTK4KTVsXUaFxtso+wvG1iHahOXaB8FM3yI4zqOXWToUkBRGQQIc6bsW5pkjbTCv sPRN56Fl40GCdpozC1WgD1dyHK1QpY2ba8mPTAcBlmuVp13P6T68/Xx X-Developer-Key: i=joshua.crofts1@gmail.com; a=ed25519; pk=Xd+UVoRPiiI0K3LHQ2XIcXmO0jvVuFTv9eTx3lgBphI= X-Endpoint-Received: by B4 Relay for joshua.crofts1@gmail.com/20260422 with auth_id=746 X-Original-From: Joshua Crofts Reply-To: joshua.crofts1@gmail.com From: Andy Shevchenko Switch the driver to use managed resources (devm_*) which simplifier error handling and allows removing ak8975_remove() method from the driver. Note, on error path we now also set mode to POWER_DOWN state which is fine. Even if the device is in that mode, there is no problem to set that mode again, it should be no-op. Signed-off-by: Andy Shevchenko Co-developed-by: Joshua Crofts Signed-off-by: Joshua Crofts --- drivers/iio/magnetometer/ak8975.c | 77 ++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c index 1c05e380a4d4f968f505a7d5c0acbec86ad949e1..84ccbca758b0121a9c4930a368cb113471d389da 100644 --- a/drivers/iio/magnetometer/ak8975.c +++ b/drivers/iio/magnetometer/ak8975.c @@ -900,9 +900,27 @@ static irqreturn_t ak8975_handle_trigger(int irq, void *p) return IRQ_HANDLED; } +static void devm_ak8975_power_off(void *data) +{ + struct ak8975_data *ak = data; + struct device *dev = &ak->client->dev; + + /* Only power down if currently active */ + if (pm_runtime_status_suspended(dev)) + return; + /* + * The device may not be runtime suspended when the driver is + * removed, so we soft-stop the chip before hard-stopping the + * regulators. + */ + ak8975_set_mode(data, POWER_DOWN); + ak8975_power_off(data); +} + static int ak8975_probe(struct i2c_client *client) { const struct i2c_device_id *id = i2c_client_get_device_id(client); + struct device *dev = &client->dev; struct ak8975_data *data; struct iio_dev *indio_dev; struct gpio_desc *eoc_gpiod; @@ -970,10 +988,21 @@ static int ak8975_probe(struct i2c_client *client) if (ret) return ret; + /* + * Set device as active early so pm_runtime_status_suspended() works + * correctly if probe fails before pm_runtime is enabled. Do not attempt + * to move this line lower. + */ + pm_runtime_set_active(dev); + + ret = devm_add_action_or_reset(dev, devm_ak8975_power_off, data); + if (ret) + return ret; + ret = ak8975_who_i_am(client, data->def->type); if (ret) { dev_err(&client->dev, "Unexpected device\n"); - goto power_off; + return ret; } dev_dbg(&client->dev, "Asahi compass chip %s\n", name); @@ -981,10 +1010,13 @@ static int ak8975_probe(struct i2c_client *client) ret = ak8975_setup(client); if (ret) { dev_err(&client->dev, "%s initialization fails\n", name); - goto power_off; + return ret; } - mutex_init(&data->lock); + ret = devm_mutex_init(dev, &data->lock); + if (ret) + return ret; + indio_dev->channels = ak8975_channels; indio_dev->num_channels = ARRAY_SIZE(ak8975_channels); indio_dev->info = &ak8975_info; @@ -992,52 +1024,32 @@ static int ak8975_probe(struct i2c_client *client) indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->name = name; - ret = iio_triggered_buffer_setup(indio_dev, NULL, ak8975_handle_trigger, - NULL); + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, + ak8975_handle_trigger, NULL); if (ret) { dev_err(&client->dev, "triggered buffer setup failed\n"); - goto power_off; + return ret; } - ret = iio_device_register(indio_dev); + ret = devm_iio_device_register(dev, indio_dev); if (ret) { dev_err(&client->dev, "device register failed\n"); - goto cleanup_buffer; + return ret; } /* Enable runtime PM */ - pm_runtime_get_noresume(&client->dev); - pm_runtime_set_active(&client->dev); - pm_runtime_enable(&client->dev); + ret = devm_pm_runtime_enable(dev); + if (ret) + return ret; + /* * The device comes online in 500us, so add two orders of magnitude * of delay before autosuspending: 50 ms. */ pm_runtime_set_autosuspend_delay(&client->dev, 50); pm_runtime_use_autosuspend(&client->dev); - pm_runtime_put(&client->dev); return 0; - -cleanup_buffer: - iio_triggered_buffer_cleanup(indio_dev); -power_off: - ak8975_power_off(data); - return ret; -} - -static void ak8975_remove(struct i2c_client *client) -{ - struct iio_dev *indio_dev = i2c_get_clientdata(client); - struct ak8975_data *data = iio_priv(indio_dev); - - pm_runtime_get_sync(&client->dev); - pm_runtime_put_noidle(&client->dev); - pm_runtime_disable(&client->dev); - iio_device_unregister(indio_dev); - iio_triggered_buffer_cleanup(indio_dev); - ak8975_set_mode(data, POWER_DOWN); - ak8975_power_off(data); } static int ak8975_runtime_suspend(struct device *dev) @@ -1131,7 +1143,6 @@ static struct i2c_driver ak8975_driver = { .acpi_match_table = ak_acpi_match, }, .probe = ak8975_probe, - .remove = ak8975_remove, .id_table = ak8975_id, }; module_i2c_driver(ak8975_driver); -- 2.47.3