From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 1C31D3803D8; Mon, 27 Apr 2026 20:14:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777320874; cv=none; b=AY1VsOz0Bk2OaSSkhLOH89ecAotmahLhJttWZNsEkpCNRagKDNmzpLJEduTk9P5YlJ7Ru1pTI9dLwpsSS1TUqAzGitfL2GFmROaEXuE59lHjc1/EFURfrQen3n0WxPOJTeSf3g3bbQdRVHRoV64Je5p8J07DUB9Xs+k3IkwkPO4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777320874; c=relaxed/simple; bh=vpZ8A2dXN0ClPhvlSu5M3FCdSJVbGw+/9Xqa6yh80v8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q+aVaQ5S9M6ty36A0w7yXWePuLrooo4qk4EYbCZ+L8e8Yk3dbeEkFbSrTQs4WjyDkbIxSIVvKf9NJCfWwV+69M39URwOKxoQmmcG3N4j7uoWEc1y8ceKz4HWcVZqe/7KaQlKxKFP3Sgr16a0bUKWNbIJrr2/C2yXEH87kSUwfx4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=TQqrbzZm; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="TQqrbzZm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1777320873; x=1808856873; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vpZ8A2dXN0ClPhvlSu5M3FCdSJVbGw+/9Xqa6yh80v8=; b=TQqrbzZmP0jV+QQdcLfp0Om86PJnnKjVHAa0981eXn+6hVIjWvFUCjVs IoM3aOCRsBMTyusSV8ayOZVJy58TkhE9dpIrQ14fdkDIW8EHzygc3QFEf CDHobteRF48zvZMFL191Cxe5rV6COmCw0Jvrw8VWguyFiHlq/dqDkMJB0 lAJpKMxpbT9wTHpcLvoe/A4WJIQ5yewqQTd9D6X75rpybpRGTKew3z04O 6+u3eJAM8duyc9TjQyCyVL9jXC8Zij22c5fbeL2j42PlDeyB0j2ZApGAQ UTO0VIZ72ERARrUm3hQV45d0wFkgMsYkuKpH9J5of5LJ81UGYeR0mlAwY Q==; X-CSE-ConnectionGUID: 1HNwjjSzTviPK/ogVXtKmw== X-CSE-MsgGUID: nvVnWEMORfumgOU7/z7g7A== X-IronPort-AV: E=McAfee;i="6800,10657,11769"; a="77384125" X-IronPort-AV: E=Sophos;i="6.23,202,1770624000"; d="scan'208";a="77384125" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2026 13:14:23 -0700 X-CSE-ConnectionGUID: 7W0A/da2SfWMIc7lNaejVQ== X-CSE-MsgGUID: JaV8IeuRSVazQv+7m18DOQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,202,1770624000"; d="scan'208";a="232857729" Received: from black.igk.intel.com ([10.91.253.5]) by orviesa010.jf.intel.com with ESMTP; 27 Apr 2026 13:14:21 -0700 Received: by black.igk.intel.com (Postfix, from userid 1003) id 71D08A6; Mon, 27 Apr 2026 22:14:17 +0200 (CEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , Andy Shevchenko , Joshua Crofts Subject: [PATCH v0 10/14] iio: magnetometer: ak8975: switch to using managed resources Date: Mon, 27 Apr 2026 22:09:55 +0200 Message-ID: <20260427201412.3067235-11-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260427201412.3067235-1-andriy.shevchenko@linux.intel.com> References: <20260427201412.3067235-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- drivers/iio/magnetometer/ak8975.c | 59 ++++++++++++++----------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c index 53158ffd173b..d666d9d171bd 100644 --- a/drivers/iio/magnetometer/ak8975.c +++ b/drivers/iio/magnetometer/ak8975.c @@ -888,9 +888,16 @@ static irqreturn_t ak8975_handle_trigger(int irq, void *p) return IRQ_HANDLED; } +static void devm_ak8975_power_off(void *data) +{ + 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; @@ -958,10 +965,14 @@ static int ak8975_probe(struct i2c_client *client) if (ret) return ret; + 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); @@ -969,10 +980,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; @@ -980,52 +994,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_set_active_enabled(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) @@ -1119,7 +1113,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.50.1