From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3E59CA9EAF for ; Mon, 21 Oct 2019 12:47:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BFDA20873 for ; Mon, 21 Oct 2019 12:47:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="kVUTvCeN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728017AbfJUMrb (ORCPT ); Mon, 21 Oct 2019 08:47:31 -0400 Received: from mail-io1-f66.google.com ([209.85.166.66]:34278 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727256AbfJUMra (ORCPT ); Mon, 21 Oct 2019 08:47:30 -0400 Received: by mail-io1-f66.google.com with SMTP id q1so15744461ion.1 for ; Mon, 21 Oct 2019 05:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=j8P+PMqsbgTEkUUXtRMl9tg90RLO2oVTHLSSpP0L1Ds=; b=kVUTvCeN6PMLc530aewm7qJZuU4ZF+RiaIJPn6GAE/1e6xAEOD1OklyPEhACcreYU5 X63xk0Gag6Htsxk8F8BRiUwqxXt3tQCsBwSZOJAs85ebSh07SqpwXPu/iebMBBiZCVBS Q0h51oFSL5L4Pbauc7bj49VxX1z3j4BNaEI6ozDs7e/KYdeqlPXJJuar3DSBb7ThuSvz BePr9q7pQJ93/o+cEGU73jxcan3VjF3n897/xZ5YGqOngCcyfO+jxPk3qjolaHQVC1oV 16itQI4PAg9Qgn0f4+idrS+d1pd9QWY0TbFyXu1bJRB5rfi5Iv+U1bFjWN4duJt9Ze/g 2q3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=j8P+PMqsbgTEkUUXtRMl9tg90RLO2oVTHLSSpP0L1Ds=; b=ciIKHUE6n7bu6AyPbFU+NV33w/UDrZSG2ajLO9dK9XAPZzqX17d7E61pNddyW6PFIL imO4RYzfh82ywT78lgXfV9U3p/uIEOHylwbeZfy9PDhZTXqQSU3EdTBg1Ft8N9EEEK2r DMf7ga+Dbf/u8KpKQLU1RU8YKGEUl+8Nk0qU/0yhKBOicqOw48M2/MIbUsG6E/YnfPvx /59Ytwxf1Q1N7bK1bXr8Qu2VkWUiytg4yS0zaKTzM9HtCuXzcizy5iq2Jxbsq3avi0PR wxXoYP8TtAn+EYnVLdXD/82qZC8E9nyaaSKBjUjH/mnO67TpOFsfc8/Zfp3ltTo8yJet SN0A== X-Gm-Message-State: APjAAAUzBnsKgafyNkiyQ1dL9zZbE88FmpGBvHrKXWzlY0zRnjDfSt6C gkj9sgGlYHmQ4JNb8fdql7Wl3V61tGc+L0uzHSSSGg== X-Google-Smtp-Source: APXvYqwn2KFCAeiVocdM7OpYEIXzmjfhzptuh44F+JsJTYnkiE8RUXwHzCNcS51fN5EvDj6Eb/6DjIBMgrXwZMdZSuc= X-Received: by 2002:a02:7b0d:: with SMTP id q13mr21070757jac.114.1571662049582; Mon, 21 Oct 2019 05:47:29 -0700 (PDT) MIME-Version: 1.0 References: <20191007024131.22708-1-brgl@bgdev.pl> <20191012143722.7cb7015d@archlinux> In-Reply-To: <20191012143722.7cb7015d@archlinux> From: Bartosz Golaszewski Date: Mon, 21 Oct 2019 14:47:18 +0200 Message-ID: Subject: Re: [PATCH v2] iio: pressure: bmp280: use devm action and remove labels from probe To: Jonathan Cameron Cc: Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , linux-iio@vger.kernel.org, Linux Kernel Mailing List , Bartosz Golaszewski Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org sob., 12 pa=C5=BA 2019 o 15:37 Jonathan Cameron napisa= =C5=82(a): > > On Mon, 7 Oct 2019 04:41:31 +0200 > Bartosz Golaszewski wrote: > > > From: Bartosz Golaszewski > > > > We can drop some duplicate code if we use devm_action for disabling > > regulators and pm and the managed variant of iio_device_register(). > > > > This allows us to completely remove all remove() callbacks from both > > i2c and spi code. > > > > Signed-off-by: Bartosz Golaszewski > This is on top of the bulk regulator patch which is awaiting precusors > getting to my upstream. I'll hold this one as well on that. > > If it looks like I've forgotten it then give me a poke. > Hi Jonathan, gentle poke after v5.4-rc4. Only one of the three patches is in next so far, the one using bulk regulators is missing too besides this one. Best regards, Bartosz Golaszewski > Thanks, > > Jonathan > > > --- > > v1 -> v2: > > - squash the patches using devm_iio_device_register() and devm_action > > to keep the changes bisectable > > > > drivers/iio/pressure/bmp280-core.c | 62 +++++++++++++++--------------- > > drivers/iio/pressure/bmp280-i2c.c | 6 --- > > drivers/iio/pressure/bmp280-spi.c | 6 --- > > drivers/iio/pressure/bmp280.h | 1 - > > 4 files changed, 30 insertions(+), 45 deletions(-) > > > > diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/= bmp280-core.c > > index c2988dbdb1a7..79254dd26dfd 100644 > > --- a/drivers/iio/pressure/bmp280-core.c > > +++ b/drivers/iio/pressure/bmp280-core.c > > @@ -984,6 +984,22 @@ static int bmp085_fetch_eoc_irq(struct device *dev= , > > return 0; > > } > > > > +static void bmp280_pm_disable(void *data) > > +{ > > + struct device *dev =3D data; > > + > > + pm_runtime_get_sync(dev); > > + pm_runtime_put_noidle(dev); > > + pm_runtime_disable(dev); > > +} > > + > > +static void bmp280_regulators_disable(void *data) > > +{ > > + struct regulator_bulk_data *supplies =3D data; > > + > > + regulator_bulk_disable(BMP280_NUM_SUPPLIES, supplies); > > +} > > + > > int bmp280_common_probe(struct device *dev, > > struct regmap *regmap, > > unsigned int chip, > > @@ -1055,6 +1071,11 @@ int bmp280_common_probe(struct device *dev, > > return ret; > > } > > > > + ret =3D devm_add_action_or_reset(dev, bmp280_regulators_disable, > > + data->supplies); > > + if (ret) > > + return ret; > > + > > /* Wait to make sure we started up properly */ > > usleep_range(data->start_up_time, data->start_up_time + 100); > > > > @@ -1069,17 +1090,16 @@ int bmp280_common_probe(struct device *dev, > > data->regmap =3D regmap; > > ret =3D regmap_read(regmap, BMP280_REG_ID, &chip_id); > > if (ret < 0) > > - goto out_disable_regulators; > > + return ret; > > if (chip_id !=3D chip) { > > dev_err(dev, "bad chip id: expected %x got %x\n", > > chip, chip_id); > > - ret =3D -EINVAL; > > - goto out_disable_regulators; > > + return -EINVAL; > > } > > > > ret =3D data->chip_info->chip_config(data); > > if (ret < 0) > > - goto out_disable_regulators; > > + return ret; > > > > dev_set_drvdata(dev, indio_dev); > > > > @@ -1093,14 +1113,14 @@ int bmp280_common_probe(struct device *dev, > > if (ret < 0) { > > dev_err(data->dev, > > "failed to read calibration coefficients\= n"); > > - goto out_disable_regulators; > > + return ret; > > } > > } else if (chip_id =3D=3D BMP280_CHIP_ID || chip_id =3D=3D BME280= _CHIP_ID) { > > ret =3D bmp280_read_calib(data, &data->calib.bmp280, chip= _id); > > if (ret < 0) { > > dev_err(data->dev, > > "failed to read calibration coefficients\= n"); > > - goto out_disable_regulators; > > + return ret; > > } > > } > > > > @@ -1112,7 +1132,7 @@ int bmp280_common_probe(struct device *dev, > > if (irq > 0 || (chip_id =3D=3D BMP180_CHIP_ID)) { > > ret =3D bmp085_fetch_eoc_irq(dev, name, irq, data); > > if (ret) > > - goto out_disable_regulators; > > + return ret; > > } > > > > /* Enable runtime PM */ > > @@ -1127,36 +1147,14 @@ int bmp280_common_probe(struct device *dev, > > pm_runtime_use_autosuspend(dev); > > pm_runtime_put(dev); > > > > - ret =3D iio_device_register(indio_dev); > > + ret =3D devm_add_action_or_reset(dev, bmp280_pm_disable, dev); > > if (ret) > > - goto out_runtime_pm_disable; > > - > > - return 0; > > + return ret; > > > > -out_runtime_pm_disable: > > - pm_runtime_get_sync(data->dev); > > - pm_runtime_put_noidle(data->dev); > > - pm_runtime_disable(data->dev); > > -out_disable_regulators: > > - regulator_bulk_disable(BMP280_NUM_SUPPLIES, data->supplies); > > - return ret; > > + return devm_iio_device_register(dev, indio_dev); > > } > > EXPORT_SYMBOL(bmp280_common_probe); > > > > -int bmp280_common_remove(struct device *dev) > > -{ > > - struct iio_dev *indio_dev =3D dev_get_drvdata(dev); > > - struct bmp280_data *data =3D iio_priv(indio_dev); > > - > > - iio_device_unregister(indio_dev); > > - pm_runtime_get_sync(data->dev); > > - pm_runtime_put_noidle(data->dev); > > - pm_runtime_disable(data->dev); > > - regulator_bulk_disable(BMP280_NUM_SUPPLIES, data->supplies); > > - return 0; > > -} > > -EXPORT_SYMBOL(bmp280_common_remove); > > - > > #ifdef CONFIG_PM > > static int bmp280_runtime_suspend(struct device *dev) > > { > > diff --git a/drivers/iio/pressure/bmp280-i2c.c b/drivers/iio/pressure/b= mp280-i2c.c > > index acd9a3784fb4..3109c8e2cc11 100644 > > --- a/drivers/iio/pressure/bmp280-i2c.c > > +++ b/drivers/iio/pressure/bmp280-i2c.c > > @@ -38,11 +38,6 @@ static int bmp280_i2c_probe(struct i2c_client *clien= t, > > client->irq); > > } > > > > -static int bmp280_i2c_remove(struct i2c_client *client) > > -{ > > - return bmp280_common_remove(&client->dev); > > -} > > - > > static const struct acpi_device_id bmp280_acpi_i2c_match[] =3D { > > {"BMP0280", BMP280_CHIP_ID }, > > {"BMP0180", BMP180_CHIP_ID }, > > @@ -82,7 +77,6 @@ static struct i2c_driver bmp280_i2c_driver =3D { > > .pm =3D &bmp280_dev_pm_ops, > > }, > > .probe =3D bmp280_i2c_probe, > > - .remove =3D bmp280_i2c_remove, > > .id_table =3D bmp280_i2c_id, > > }; > > module_i2c_driver(bmp280_i2c_driver); > > diff --git a/drivers/iio/pressure/bmp280-spi.c b/drivers/iio/pressure/b= mp280-spi.c > > index 9d57b7a3b134..625b86878ad8 100644 > > --- a/drivers/iio/pressure/bmp280-spi.c > > +++ b/drivers/iio/pressure/bmp280-spi.c > > @@ -86,11 +86,6 @@ static int bmp280_spi_probe(struct spi_device *spi) > > spi->irq); > > } > > > > -static int bmp280_spi_remove(struct spi_device *spi) > > -{ > > - return bmp280_common_remove(&spi->dev); > > -} > > - > > static const struct of_device_id bmp280_of_spi_match[] =3D { > > { .compatible =3D "bosch,bmp085", }, > > { .compatible =3D "bosch,bmp180", }, > > @@ -118,7 +113,6 @@ static struct spi_driver bmp280_spi_driver =3D { > > }, > > .id_table =3D bmp280_spi_id, > > .probe =3D bmp280_spi_probe, > > - .remove =3D bmp280_spi_remove, > > }; > > module_spi_driver(bmp280_spi_driver); > > > > diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp28= 0.h > > index eda50ef65706..57ba0e85db91 100644 > > --- a/drivers/iio/pressure/bmp280.h > > +++ b/drivers/iio/pressure/bmp280.h > > @@ -112,7 +112,6 @@ int bmp280_common_probe(struct device *dev, > > unsigned int chip, > > const char *name, > > int irq); > > -int bmp280_common_remove(struct device *dev); > > > > /* PM ops */ > > extern const struct dev_pm_ops bmp280_dev_pm_ops; >