linux-kernel - Re: [PATCH v2 4/8] iio: accel: adxl345: Make use of device properties

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220226190558.6a05ef7c@jic23-huawei>
Date:   Sat, 26 Feb 2022 19:05:58 +0000
From:   Jonathan Cameron <jic23@...nel.org>
To:     Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc:     linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org,
        Lars-Peter Clausen <lars@...afoo.de>,
        Michael Hennerich <Michael.Hennerich@...log.com>,
        Kai-Heng Feng <kai.heng.feng@...onical.com>
Subject: Re: [PATCH v2 4/8] iio: accel: adxl345: Make use of device
 properties

On Tue, 22 Feb 2022 11:00:05 +0200
Andy Shevchenko <andriy.shevchenko@...ux.intel.com> wrote:

> Convert the module to be property provider agnostic and allow
> it to be used on non-OF platforms.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
> ---
> 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 <linux/module.h>
> +#include <linux/property.h>
>  #include <linux/regmap.h>
>  
>  #include <linux/iio/iio.h>
> @@ -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[] = {