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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B647C433F5 for ; Sat, 26 Feb 2022 18:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232022AbiBZS7e (ORCPT ); Sat, 26 Feb 2022 13:59:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231140AbiBZS7d (ORCPT ); Sat, 26 Feb 2022 13:59:33 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44164261D3C; Sat, 26 Feb 2022 10:58:58 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D13DD60F32; Sat, 26 Feb 2022 18:58:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87B2AC340E8; Sat, 26 Feb 2022 18:58:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645901937; bh=Qul/qbRtHQZVOnJVzm5ldXOQk/fx2nmno7mQUOwaX30=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=pTYWRLLLxkXNyZXxvNm6bqp+TiPQNRnAghbYchoyZLt/ZkoqkexJrIEUq1ygg7nw9 cjr4wFIc+ordND+knly3Scbrv0XJvsrZzVUGvrzU7Tcz3Jv9a+3oU/KiiqNkog2Ne2 OoPHrnopGuN3//ztAq3VDBLSasjxTPcAc6ao4jUNOgHKcInRzLGsyHVv1plzIn0pCf nwIDMo3uQh0g6kdNjfGTUEtZxKk5V3J43bHzmGLpDg6LCiNpwO5k+JinoraHjjL7kR 7L8lPobBgXpbuRjil582zOtrk3jJmHjAGeaPSbA6zszAo+00GDW1D6aMc5dwx1wPMz VrjgUuSgSKpBw== Date: Sat, 26 Feb 2022 19:05:58 +0000 From: Jonathan Cameron To: Andy Shevchenko Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Lars-Peter Clausen , Michael Hennerich , Kai-Heng Feng Subject: Re: [PATCH v2 4/8] iio: accel: adxl345: Make use of device properties Message-ID: <20220226190558.6a05ef7c@jic23-huawei> In-Reply-To: <20220222090009.2060-4-andriy.shevchenko@linux.intel.com> References: <20220222090009.2060-1-andriy.shevchenko@linux.intel.com> <20220222090009.2060-4-andriy.shevchenko@linux.intel.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Tue, 22 Feb 2022 11:00:05 +0200 Andy Shevchenko wrote: > Convert the module to be property provider agnostic and allow > it to be used on non-OF platforms. > > Signed-off-by: Andy Shevchenko > --- > v2: no changes > drivers/iio/accel/adxl345.h | 2 +- > drivers/iio/accel/adxl345_core.c | 5 ++++- > drivers/iio/accel/adxl345_i2c.c | 11 ++++------- > drivers/iio/accel/adxl345_spi.c | 3 +-- > 4 files changed, 10 insertions(+), 11 deletions(-) > > diff --git a/drivers/iio/accel/adxl345.h b/drivers/iio/accel/adxl345.h > index 9b0d4f487c43..d7e67cb08538 100644 > --- a/drivers/iio/accel/adxl345.h > +++ b/drivers/iio/accel/adxl345.h > @@ -13,6 +13,6 @@ enum adxl345_device_type { > ADXL375 = 2, > }; > > -int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type); > +int adxl345_core_probe(struct device *dev, struct regmap *regmap); Ah! They shorten again :) Temporary long ugly lines is of course fine so I'll leave them be. Jonathan > > #endif /* _ADXL345_H_ */ > diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c > index 0f34c349aa1e..315a408115b3 100644 > --- a/drivers/iio/accel/adxl345_core.c > +++ b/drivers/iio/accel/adxl345_core.c > @@ -8,6 +8,7 @@ > */ > > #include > +#include > #include > > #include > @@ -213,14 +214,16 @@ static void adxl345_powerdown(void *regmap) > regmap_write(regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_STANDBY); > } > > -int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type) > +int adxl345_core_probe(struct device *dev, struct regmap *regmap) > { > + enum adxl345_device_type type; > struct adxl345_data *data; > struct iio_dev *indio_dev; > const char *name; > u32 regval; > int ret; > > + type = (uintptr_t)device_get_match_data(dev); > switch (type) { > case ADXL345: > name = "adxl345"; > diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c > index 1e42cf3a2991..861d8477d799 100644 > --- a/drivers/iio/accel/adxl345_i2c.c > +++ b/drivers/iio/accel/adxl345_i2c.c > @@ -19,19 +19,16 @@ static const struct regmap_config adxl345_i2c_regmap_config = { > .val_bits = 8, > }; > > -static int adxl345_i2c_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int adxl345_i2c_probe(struct i2c_client *client) > { > + enum adxl345_device_type type; > struct regmap *regmap; > > - if (!id) > - return -ENODEV; > - > regmap = devm_regmap_init_i2c(client, &adxl345_i2c_regmap_config); > if (IS_ERR(regmap)) > return dev_err_probe(&client->dev, PTR_ERR(regmap), "Error initializing regmap\n"); > > - return adxl345_core_probe(&client->dev, regmap, id->driver_data); > + return adxl345_core_probe(&client->dev, regmap); > } > > static const struct i2c_device_id adxl345_i2c_id[] = { > @@ -55,7 +52,7 @@ static struct i2c_driver adxl345_i2c_driver = { > .name = "adxl345_i2c", > .of_match_table = adxl345_of_match, > }, > - .probe = adxl345_i2c_probe, > + .probe_new = adxl345_i2c_probe, > .id_table = adxl345_i2c_id, > }; > > diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c > index 34b7001d519f..ee4c50c8a95b 100644 > --- a/drivers/iio/accel/adxl345_spi.c > +++ b/drivers/iio/accel/adxl345_spi.c > @@ -22,7 +22,6 @@ static const struct regmap_config adxl345_spi_regmap_config = { > > static int adxl345_spi_probe(struct spi_device *spi) > { > - const struct spi_device_id *id = spi_get_device_id(spi); > struct regmap *regmap; > > /* Bail out if max_speed_hz exceeds 5 MHz */ > @@ -34,7 +33,7 @@ static int adxl345_spi_probe(struct spi_device *spi) > if (IS_ERR(regmap)) > return dev_err_probe(&spi->dev, PTR_ERR(regmap), "Error initializing regmap\n"); > > - return adxl345_core_probe(&spi->dev, regmap, id->driver_data); > + return adxl345_core_probe(&spi->dev, regmap); > } > > static const struct spi_device_id adxl345_spi_id[] = {