| 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
| ||
|
Message-ID: <3803a348-d713-4859-ac52-dbb123a69804@baylibre.com>
Date: Wed, 8 Jan 2025 15:19:12 -0600
From: David Lechner <dlechner@...libre.com>
To: Angelo Dureghello <adureghello@...libre.com>,
Lars-Peter Clausen <lars@...afoo.de>,
Michael Hennerich <Michael.Hennerich@...log.com>,
Jonathan Cameron <jic23@...nel.org>,
Mihail Chindris <mihail.chindris@...log.com>, Nuno Sa <nuno.sa@...log.com>
Cc: Jonathan Cameron <Jonathan.Cameron@...wei.com>,
linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 7/9] iio: dac: ad3552r: share model data structures
On 1/8/25 11:29 AM, Angelo Dureghello wrote:
> From: Angelo Dureghello <adureghello@...libre.com>
>
> Preparing for new parts to be added also in the hs driver,
> set model data structures in ad3552r-common.c, to be accessible
> from both -hs and non hs driver.
>
> Signed-off-by: Angelo Dureghello <adureghello@...libre.com>
> ---
> drivers/iio/dac/ad3552r-common.c | 40 ++++++++++++++++++++++++++++++++++++++++
> drivers/iio/dac/ad3552r-hs.c | 8 --------
> drivers/iio/dac/ad3552r.c | 36 ------------------------------------
> drivers/iio/dac/ad3552r.h | 5 +++++
> 4 files changed, 45 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/iio/dac/ad3552r-common.c b/drivers/iio/dac/ad3552r-common.c
> index 03e0864f5084..36920ec95836 100644
> --- a/drivers/iio/dac/ad3552r-common.c
> +++ b/drivers/iio/dac/ad3552r-common.c
> @@ -37,6 +37,46 @@ static const s32 gains_scaling_table[] = {
> [AD3552R_CH_GAIN_SCALING_0_125] = 125
> };
>
> +const struct ad3552r_model_data ad3541r_model_data = {
> + .model_name = "ad3541r",
> + .chip_id = AD3541R_ID,
> + .num_hw_channels = 1,
> + .ranges_table = ad3542r_ch_ranges,
> + .num_ranges = ARRAY_SIZE(ad3542r_ch_ranges),
> + .requires_output_range = true,
> +};
> +EXPORT_SYMBOL_NS_GPL(ad3541r_model_data, "IIO_AD3552R");
> +
> +const struct ad3552r_model_data ad3542r_model_data = {
> + .model_name = "ad3542r",
> + .chip_id = AD3542R_ID,
> + .num_hw_channels = 2,
> + .ranges_table = ad3542r_ch_ranges,
> + .num_ranges = ARRAY_SIZE(ad3542r_ch_ranges),
> + .requires_output_range = true,
> +};
> +EXPORT_SYMBOL_NS_GPL(ad3542r_model_data, "IIO_AD3552R");
> +
> +const struct ad3552r_model_data ad3551r_model_data = {
> + .model_name = "ad3551r",
> + .chip_id = AD3551R_ID,
> + .num_hw_channels = 1,
> + .ranges_table = ad3552r_ch_ranges,
> + .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> + .requires_output_range = false,
> +};
> +EXPORT_SYMBOL_NS_GPL(ad3551r_model_data, "IIO_AD3552R");
> +
> +const struct ad3552r_model_data ad3552r_model_data = {
> + .model_name = "ad3552r",
> + .chip_id = AD3552R_ID,
> + .num_hw_channels = 2,
> + .ranges_table = ad3552r_ch_ranges,
> + .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> + .requires_output_range = false,
> +};
> +EXPORT_SYMBOL_NS_GPL(ad3552r_model_data, "IIO_AD3552R");
> +
> u16 ad3552r_calc_custom_gain(u8 p, u8 n, s16 goffs)
> {
> return FIELD_PREP(AD3552R_MASK_CH_RANGE_OVERRIDE, 1) |
> diff --git a/drivers/iio/dac/ad3552r-hs.c b/drivers/iio/dac/ad3552r-hs.c
> index 991b11702273..bfb6228c9b9b 100644
> --- a/drivers/iio/dac/ad3552r-hs.c
> +++ b/drivers/iio/dac/ad3552r-hs.c
> @@ -527,14 +527,6 @@ static int ad3552r_hs_probe(struct platform_device *pdev)
> return devm_iio_device_register(&pdev->dev, indio_dev);
> }
>
> -static const struct ad3552r_model_data ad3552r_model_data = {
> - .model_name = "ad3552r",
> - .chip_id = AD3552R_ID,
> - .num_hw_channels = 2,
> - .ranges_table = ad3552r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> -};
> -
> static const struct of_device_id ad3552r_hs_of_id[] = {
> { .compatible = "adi,ad3552r", .data = &ad3552r_model_data },
> { }
> diff --git a/drivers/iio/dac/ad3552r.c b/drivers/iio/dac/ad3552r.c
> index e7206af53af6..9d28e06b80c0 100644
> --- a/drivers/iio/dac/ad3552r.c
> +++ b/drivers/iio/dac/ad3552r.c
> @@ -649,42 +649,6 @@ static int ad3552r_probe(struct spi_device *spi)
> return devm_iio_device_register(&spi->dev, indio_dev);
> }
>
> -static const struct ad3552r_model_data ad3541r_model_data = {
> - .model_name = "ad3541r",
> - .chip_id = AD3541R_ID,
> - .num_hw_channels = 1,
> - .ranges_table = ad3542r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3542r_ch_ranges),
> - .requires_output_range = true,
> -};
> -
> -static const struct ad3552r_model_data ad3542r_model_data = {
> - .model_name = "ad3542r",
> - .chip_id = AD3542R_ID,
> - .num_hw_channels = 2,
> - .ranges_table = ad3542r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3542r_ch_ranges),
> - .requires_output_range = true,
> -};
> -
> -static const struct ad3552r_model_data ad3551r_model_data = {
> - .model_name = "ad3551r",
> - .chip_id = AD3551R_ID,
> - .num_hw_channels = 1,
> - .ranges_table = ad3552r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> - .requires_output_range = false,
> -};
> -
> -static const struct ad3552r_model_data ad3552r_model_data = {
> - .model_name = "ad3552r",
> - .chip_id = AD3552R_ID,
> - .num_hw_channels = 2,
> - .ranges_table = ad3552r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> - .requires_output_range = false,
> -};
> -
> static const struct spi_device_id ad3552r_id[] = {
> {
> .name = "ad3541r",
> diff --git a/drivers/iio/dac/ad3552r.h b/drivers/iio/dac/ad3552r.h
> index 4b5581039ae9..23f038464a0c 100644
> --- a/drivers/iio/dac/ad3552r.h
> +++ b/drivers/iio/dac/ad3552r.h
> @@ -137,6 +137,11 @@
> extern const s32 ad3552r_ch_ranges[AD3552R_MAX_RANGES][2];
> extern const s32 ad3542r_ch_ranges[AD3542R_MAX_RANGES][2];
Do the ranges still need to be extern now or can we make them static in
ad3552r-common.c?
>
> +extern const struct ad3552r_model_data ad3541r_model_data;
> +extern const struct ad3552r_model_data ad3542r_model_data;
> +extern const struct ad3552r_model_data ad3551r_model_data;
> +extern const struct ad3552r_model_data ad3552r_model_data;
> +
> enum ad3552r_id {
> AD3541R_ID = 0x400b,
> AD3542R_ID = 0x4009,
>
Powered by blists - more mailing lists