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: light: vcnl4000: use variables for I2C client and device instances

After moving data->client and client->dev into variables of their own,
replace all instances of data->client and client->dev being used in
vcnl4200_init() and vcnl4000_probe() by the said variables to reduce
clutter.

Reviewed-by: David Lechner <dlechner@baylibre.com>
Signed-off-by: Erikas Bitovtas <xerikasxx@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Erikas Bitovtas and committed by
Jonathan Cameron c4380f90 b10aecd9

+16 -19
+16 -19
drivers/iio/light/vcnl4000.c
··· 361 361 int ret, id; 362 362 u16 regval; 363 363 364 - ret = i2c_smbus_read_word_data(data->client, VCNL4200_DEV_ID); 364 + ret = i2c_smbus_read_word_data(client, VCNL4200_DEV_ID); 365 365 if (ret < 0) 366 366 return ret; 367 367 368 368 id = ret & 0xff; 369 369 370 370 if (id != VCNL4200_PROD_ID) { 371 - ret = i2c_smbus_read_word_data(data->client, VCNL4040_DEV_ID); 371 + ret = i2c_smbus_read_word_data(client, VCNL4040_DEV_ID); 372 372 if (ret < 0) 373 373 return ret; 374 374 ··· 378 378 return -ENODEV; 379 379 } 380 380 381 - dev_dbg(&data->client->dev, "device id 0x%x", id); 381 + dev_dbg(dev, "device id 0x%x", id); 382 382 383 383 data->rev = (ret >> 8) & 0xf; 384 384 data->ps_int = 0; ··· 412 412 return ret; 413 413 414 414 /* Use 16 bits proximity sensor readings */ 415 - ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); 415 + ret = i2c_smbus_read_word_data(client, VCNL4200_PS_CONF1); 416 416 if (ret < 0) 417 417 return ret; 418 418 419 419 regval = ret | VCNL4040_PS_CONF2_PS_HD; 420 - ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, 421 - regval); 420 + ret = i2c_smbus_write_word_data(client, VCNL4200_PS_CONF1, regval); 422 421 if (ret < 0) 423 422 return ret; 424 423 425 424 /* Align proximity sensor sample rate to 16 bits data width */ 426 - ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF3); 425 + ret = i2c_smbus_read_word_data(client, VCNL4200_PS_CONF3); 427 426 if (ret < 0) 428 427 return ret; 429 428 430 429 regval = ret | VCNL4040_CONF3_PS_SAMPLE_16BITS; 431 - ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF3, 432 - regval); 430 + ret = i2c_smbus_write_word_data(client, VCNL4200_PS_CONF3, regval); 433 431 if (ret < 0) 434 432 return ret; 435 433 ··· 1990 1992 struct iio_dev *indio_dev; 1991 1993 int ret; 1992 1994 1993 - indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); 1995 + indio_dev = devm_iio_device_alloc(dev, sizeof(*data)); 1994 1996 if (!indio_dev) 1995 1997 return -ENOMEM; 1996 1998 ··· 2012 2014 if (ret) 2013 2015 return ret; 2014 2016 2015 - dev_dbg(&client->dev, "%s Ambient light/proximity sensor, Rev: %02x\n", 2017 + dev_dbg(dev, "%s Ambient light/proximity sensor, Rev: %02x\n", 2016 2018 data->chip_spec->prod, data->rev); 2017 2019 2018 2020 if (device_property_read_u32(&client->dev, "proximity-near-level", ··· 2027 2029 2028 2030 if (data->chip_spec->trig_buffer_func && 2029 2031 data->chip_spec->buffer_setup_ops) { 2030 - ret = devm_iio_triggered_buffer_setup(&client->dev, indio_dev, 2031 - NULL, 2032 + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, 2032 2033 data->chip_spec->trig_buffer_func, 2033 2034 data->chip_spec->buffer_setup_ops); 2034 2035 if (ret < 0) ··· 2035 2038 } 2036 2039 2037 2040 if (client->irq && data->chip_spec->irq_thread) { 2038 - ret = devm_request_threaded_irq(&client->dev, client->irq, 2039 - NULL, data->chip_spec->irq_thread, 2041 + ret = devm_request_threaded_irq(dev, client->irq, NULL, 2042 + data->chip_spec->irq_thread, 2040 2043 IRQF_TRIGGER_FALLING | 2041 2044 IRQF_ONESHOT, 2042 2045 "vcnl4000_irq", ··· 2049 2052 return ret; 2050 2053 } 2051 2054 2052 - ret = pm_runtime_set_active(&client->dev); 2055 + ret = pm_runtime_set_active(dev); 2053 2056 if (ret < 0) 2054 2057 goto fail_poweroff; 2055 2058 ··· 2057 2060 if (ret < 0) 2058 2061 goto fail_poweroff; 2059 2062 2060 - pm_runtime_enable(&client->dev); 2061 - pm_runtime_set_autosuspend_delay(&client->dev, VCNL4000_SLEEP_DELAY_MS); 2062 - pm_runtime_use_autosuspend(&client->dev); 2063 + pm_runtime_enable(dev); 2064 + pm_runtime_set_autosuspend_delay(dev, VCNL4000_SLEEP_DELAY_MS); 2065 + pm_runtime_use_autosuspend(dev); 2063 2066 2064 2067 return 0; 2065 2068 fail_poweroff: