tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: proximity: sx_common: Don't use IIO device for properties

It's not correct to use artificial device created by IIO core to
retrieve device properties. Even ->get_default_reg() callback
takes a simple struct device pointer which suggests it wants to
operate on the real device.

Correct this by replacing pointer to IIO device by a real device
pointer in the caller of ->get_default_reg().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Link: https://lore.kernel.org/r/20220615114746.2767-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Andy Shevchenko and committed by
Jonathan Cameron 7008f35c bc72d938

+3 -4
+3 -4
drivers/iio/proximity/sx_common.c
··· 434 434 435 435 #define SX_COMMON_SOFT_RESET 0xde 436 436 437 - static int sx_common_init_device(struct iio_dev *indio_dev) 437 + static int sx_common_init_device(struct device *dev, struct iio_dev *indio_dev) 438 438 { 439 439 struct sx_common_data *data = iio_priv(indio_dev); 440 440 struct sx_common_reg_default tmp; ··· 456 456 457 457 /* Program defaults from constant or BIOS. */ 458 458 for (i = 0; i < data->chip_info->num_default_regs; i++) { 459 - initval = data->chip_info->ops.get_default_reg(&indio_dev->dev, 460 - i, &tmp); 459 + initval = data->chip_info->ops.get_default_reg(dev, i, &tmp); 461 460 ret = regmap_write(data->regmap, initval->reg, initval->def); 462 461 if (ret) 463 462 return ret; ··· 529 530 530 531 i2c_set_clientdata(client, indio_dev); 531 532 532 - ret = sx_common_init_device(indio_dev); 533 + ret = sx_common_init_device(dev, indio_dev); 533 534 if (ret) 534 535 return dev_err_probe(dev, ret, "Unable to initialize sensor\n"); 535 536