Commit 5cad30ab authored by Nuno Sa's avatar Nuno Sa Committed by Jonathan Cameron
Browse files

iio: temperature: ltc2983: explicitly set the name in chip_info 



Getting the part name with 'spi_get_device_id(spi)->name' is not a very
good pattern. Hence, explicitly add the name in the struct chip_info and
use that instead.

Signed-off-by: default avatarNuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20240222-ltc2983-misc-improv-v1-4-cf7d4457e98c@analog.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent dccdff35

drivers/iio/temperature/ltc2983.c

+15 −5
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ enum { 
		container_of(_sensor, struct ltc2983_temp, sensor)



struct ltc2983_chip_info {

	const char *name;

	unsigned int max_channels_nr;

	bool has_temp;

	bool has_eeprom;
@@ -1605,7 +1606,6 @@ static int ltc2983_probe(struct spi_device *spi) 
	struct ltc2983_data *st;

	struct iio_dev *indio_dev;

	struct gpio_desc *gpio;

	const char *name = spi_get_device_id(spi)->name;

	int ret;



	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
@@ -1655,7 +1655,7 @@ static int ltc2983_probe(struct spi_device *spi) 
		return ret;



	ret = devm_request_irq(&spi->dev, spi->irq, ltc2983_irq_handler,

			       IRQF_TRIGGER_RISING, name, st);

			       IRQF_TRIGGER_RISING, st->info->name, st);

	if (ret) {

		dev_err(&spi->dev, "failed to request an irq, %d", ret);

		return ret;
@@ -1670,7 +1670,7 @@ static int ltc2983_probe(struct spi_device *spi) 
			return ret;

	}



	indio_dev->name = name;

	indio_dev->name = st->info->name;

	indio_dev->num_channels = st->iio_channels;

	indio_dev->channels = st->iio_chan;

	indio_dev->modes = INDIO_DIRECT_MODE;
@@ -1701,15 +1701,25 @@ static DEFINE_SIMPLE_DEV_PM_OPS(ltc2983_pm_ops, ltc2983_suspend, 
				ltc2983_resume);



static const struct ltc2983_chip_info ltc2983_chip_info_data = {

	.name = "ltc2983",

	.max_channels_nr = 20,

};



static const struct ltc2983_chip_info ltc2984_chip_info_data = {

	.name = "ltc2984",

	.max_channels_nr = 20,

	.has_eeprom = true,

};



static const struct ltc2983_chip_info ltc2986_chip_info_data = {

	.name = "ltc2986",

	.max_channels_nr = 10,

	.has_temp = true,

	.has_eeprom = true,

};



static const struct ltc2983_chip_info ltm2985_chip_info_data = {

	.name = "ltm2985",

	.max_channels_nr = 10,

	.has_temp = true,

	.has_eeprom = true,
@@ -1719,7 +1729,7 @@ static const struct spi_device_id ltc2983_id_table[] = { 
	{ "ltc2983", (kernel_ulong_t)&ltc2983_chip_info_data },

	{ "ltc2984", (kernel_ulong_t)&ltc2984_chip_info_data },

	{ "ltc2986", (kernel_ulong_t)&ltc2986_chip_info_data },

	{ "ltm2985", (kernel_ulong_t)&ltc2986_chip_info_data },

	{ "ltm2985", (kernel_ulong_t)&ltm2985_chip_info_data },

	{},

};

MODULE_DEVICE_TABLE(spi, ltc2983_id_table);
@@ -1728,7 +1738,7 @@ static const struct of_device_id ltc2983_of_match[] = { 
	{ .compatible = "adi,ltc2983", .data = &ltc2983_chip_info_data },

	{ .compatible = "adi,ltc2984", .data = &ltc2984_chip_info_data },

	{ .compatible = "adi,ltc2986", .data = &ltc2986_chip_info_data },

	{ .compatible = "adi,ltm2985", .data = &ltc2986_chip_info_data },

	{ .compatible = "adi,ltm2985", .data = &ltm2985_chip_info_data },

	{},

};

MODULE_DEVICE_TABLE(of, ltc2983_of_match);