From patchwork Sun Oct 3 16:02:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 12532795 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C79EC433EF for ; Sun, 3 Oct 2021 15:58:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83B4761166 for ; Sun, 3 Oct 2021 15:58:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231165AbhJCQAT (ORCPT ); Sun, 3 Oct 2021 12:00:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:49488 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230426AbhJCQAS (ORCPT ); Sun, 3 Oct 2021 12:00:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4D54661AAC; Sun, 3 Oct 2021 15:58:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633276711; bh=xupU4Uk9Dq0tgfvbewVuLMYEVHyM/NG0yv1ECFWas4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D4nG571iWdATAbXLt3L0HWk7DU/PGIOzt9YgFH3U0tzeD+AdJZxHjKt1VF+tCBuQ4 tQ6+r2oRYjXTNYp9m2gv8SeXplPBrtdVUubmxIk51t8IcPOQRBZEEpE2aD71lVmDHH /jnHwxo4H8tqIH6lIcysqXIe6leZgj4jgShqRvvLJ/DWHv0MUucdeFRjxgy9jFnTT0 Li/BgSQR4sWiLAjGqoBTFkZ4ve9yjRIkQhDtNzEEmYuMkICMQHSsFspUAlT30iQwh3 UNzokkQQI+IsM7MZAIzHtt22VABwrsXWEltzhECoZHMsfsAXIpFXjo9mdb6mOUqMOs jfLR6gs1kViUw== From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: Andy Shevchenko , Hans de Goede , Alexandru Ardelean , Shawn Guo , Jonathan Cameron Subject: [RESEND v2 4/5] iio: accel: mma9551: Use devm managed functions to tidy up probe() Date: Sun, 3 Oct 2021 17:02:11 +0100 Message-Id: <20211003160212.417909-5-jic23@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211003160212.417909-1-jic23@kernel.org> References: <20211003160212.417909-1-jic23@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Jonathan Cameron The error handling in here left runtime pm enabled, and didn't do the same steps as occurred in remove. Moving over to fully devm_ managed makes it harder to get this stuff wrong, so let's do that. Signed-off-by: Jonathan Cameron Reviewed-by: Alexandru Ardelean --- drivers/iio/accel/mma9551.c | 71 ++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c index 537a7a04654a..a00a7e067883 100644 --- a/drivers/iio/accel/mma9551.c +++ b/drivers/iio/accel/mma9551.c @@ -389,6 +389,15 @@ static irqreturn_t mma9551_event_handler(int irq, void *private) return IRQ_HANDLED; } +static void mma9551_disable_cb(void *_data) +{ + struct mma9551_data *data = _data; + + mutex_lock(&data->mutex); + mma9551_set_device_state(data->client, false); + mutex_unlock(&data->mutex); +} + static int mma9551_init(struct mma9551_data *data) { int ret; @@ -397,7 +406,12 @@ static int mma9551_init(struct mma9551_data *data) if (ret) return ret; - return mma9551_set_device_state(data->client, true); + ret = mma9551_set_device_state(data->client, true); + if (ret) + return ret; + + return devm_add_action_or_reset(&data->client->dev, mma9551_disable_cb, + data); } static int mma9551_irq_probe(struct iio_dev *indio_dev) @@ -425,6 +439,16 @@ static int mma9551_irq_probe(struct iio_dev *indio_dev) return 0; } +static void mma9551_rpm_susp(void *d) +{ + pm_runtime_set_suspended(d); +} + +static void mma9551_rpm_disable(void *d) +{ + pm_runtime_disable(d); +} + static int mma9551_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -458,46 +482,28 @@ static int mma9551_probe(struct i2c_client *client, ret = mma9551_irq_probe(indio_dev); if (ret < 0) - goto out_poweroff; + return ret; ret = pm_runtime_set_active(&client->dev); if (ret < 0) - goto out_poweroff; + return ret; + + ret = devm_add_action_or_reset(&client->dev, mma9551_rpm_susp, + &client->dev); + if (ret) + return ret; pm_runtime_enable(&client->dev); + ret = devm_add_action_or_reset(&client->dev, mma9551_rpm_disable, + &client->dev); + if (ret) + return ret; + pm_runtime_set_autosuspend_delay(&client->dev, MMA9551_AUTO_SUSPEND_DELAY_MS); pm_runtime_use_autosuspend(&client->dev); - ret = iio_device_register(indio_dev); - if (ret < 0) { - dev_err(&client->dev, "unable to register iio device\n"); - goto out_poweroff; - } - - return 0; - -out_poweroff: - mma9551_set_device_state(client, false); - - return ret; -} - -static int mma9551_remove(struct i2c_client *client) -{ - struct iio_dev *indio_dev = i2c_get_clientdata(client); - struct mma9551_data *data = iio_priv(indio_dev); - - iio_device_unregister(indio_dev); - - pm_runtime_disable(&client->dev); - pm_runtime_set_suspended(&client->dev); - - mutex_lock(&data->mutex); - mma9551_set_device_state(data->client, false); - mutex_unlock(&data->mutex); - - return 0; + return devm_iio_device_register(&client->dev, indio_dev); } static __maybe_unused int mma9551_runtime_suspend(struct device *dev) @@ -552,7 +558,6 @@ static struct i2c_driver mma9551_driver = { .pm = &mma9551_pm_ops, }, .probe = mma9551_probe, - .remove = mma9551_remove, .id_table = mma9551_id, };