aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-09-01 05:44:47 -0400
committerJonathan Cameron <jic23@kernel.org>2016-09-18 06:35:26 -0400
commit79383aaec47a0ea0df49728ad0b8e72c4ac58fd0 (patch)
treef2b90f058fb9952759d911dc621c58908156596e
parent2bb4a02aad0257148be4f51e3b4c9c0077787e17 (diff)
iio: accel: kxsd9: Replace "parent" with "dev"
What is passed to the .probe() and .remove() functions is technically the parent of the created IIO device but it becomes a big confusion for the head to have it named like this since it is usually clear from context the "dev" refers to the physical device, and when next adding PM callbacks a clean "struct device *dev" pointer is passed to these and that makes it even more confused. Rename "parent" to "dev" like in most other drivers. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/accel/kxsd9.c20
-rw-r--r--drivers/iio/accel/kxsd9.h4
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index dc53f70e616e..f18cc9436094 100644
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -335,7 +335,7 @@ static const struct iio_info kxsd9_info = {
335/* Four channels apart from timestamp, scan mask = 0x0f */ 335/* Four channels apart from timestamp, scan mask = 0x0f */
336static const unsigned long kxsd9_scan_masks[] = { 0xf, 0 }; 336static const unsigned long kxsd9_scan_masks[] = { 0xf, 0 };
337 337
338int kxsd9_common_probe(struct device *parent, 338int kxsd9_common_probe(struct device *dev,
339 struct regmap *map, 339 struct regmap *map,
340 const char *name) 340 const char *name)
341{ 341{
@@ -343,18 +343,18 @@ int kxsd9_common_probe(struct device *parent,
343 struct kxsd9_state *st; 343 struct kxsd9_state *st;
344 int ret; 344 int ret;
345 345
346 indio_dev = devm_iio_device_alloc(parent, sizeof(*st)); 346 indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
347 if (!indio_dev) 347 if (!indio_dev)
348 return -ENOMEM; 348 return -ENOMEM;
349 349
350 st = iio_priv(indio_dev); 350 st = iio_priv(indio_dev);
351 st->dev = parent; 351 st->dev = dev;
352 st->map = map; 352 st->map = map;
353 353
354 indio_dev->channels = kxsd9_channels; 354 indio_dev->channels = kxsd9_channels;
355 indio_dev->num_channels = ARRAY_SIZE(kxsd9_channels); 355 indio_dev->num_channels = ARRAY_SIZE(kxsd9_channels);
356 indio_dev->name = name; 356 indio_dev->name = name;
357 indio_dev->dev.parent = parent; 357 indio_dev->dev.parent = dev;
358 indio_dev->info = &kxsd9_info; 358 indio_dev->info = &kxsd9_info;
359 indio_dev->modes = INDIO_DIRECT_MODE; 359 indio_dev->modes = INDIO_DIRECT_MODE;
360 indio_dev->available_scan_masks = kxsd9_scan_masks; 360 indio_dev->available_scan_masks = kxsd9_scan_masks;
@@ -362,11 +362,11 @@ int kxsd9_common_probe(struct device *parent,
362 /* Fetch and turn on regulators */ 362 /* Fetch and turn on regulators */
363 st->regs[0].supply = kxsd9_reg_vdd; 363 st->regs[0].supply = kxsd9_reg_vdd;
364 st->regs[1].supply = kxsd9_reg_iovdd; 364 st->regs[1].supply = kxsd9_reg_iovdd;
365 ret = devm_regulator_bulk_get(parent, 365 ret = devm_regulator_bulk_get(dev,
366 ARRAY_SIZE(st->regs), 366 ARRAY_SIZE(st->regs),
367 st->regs); 367 st->regs);
368 if (ret) { 368 if (ret) {
369 dev_err(parent, "Cannot get regulators\n"); 369 dev_err(dev, "Cannot get regulators\n");
370 return ret; 370 return ret;
371 } 371 }
372 372
@@ -377,7 +377,7 @@ int kxsd9_common_probe(struct device *parent,
377 kxsd9_trigger_handler, 377 kxsd9_trigger_handler,
378 NULL); 378 NULL);
379 if (ret) { 379 if (ret) {
380 dev_err(parent, "triggered buffer setup failed\n"); 380 dev_err(dev, "triggered buffer setup failed\n");
381 goto err_power_down; 381 goto err_power_down;
382 } 382 }
383 383
@@ -385,7 +385,7 @@ int kxsd9_common_probe(struct device *parent,
385 if (ret) 385 if (ret)
386 goto err_cleanup_buffer; 386 goto err_cleanup_buffer;
387 387
388 dev_set_drvdata(parent, indio_dev); 388 dev_set_drvdata(dev, indio_dev);
389 389
390 return 0; 390 return 0;
391 391
@@ -398,9 +398,9 @@ err_power_down:
398} 398}
399EXPORT_SYMBOL(kxsd9_common_probe); 399EXPORT_SYMBOL(kxsd9_common_probe);
400 400
401int kxsd9_common_remove(struct device *parent) 401int kxsd9_common_remove(struct device *dev)
402{ 402{
403 struct iio_dev *indio_dev = dev_get_drvdata(parent); 403 struct iio_dev *indio_dev = dev_get_drvdata(dev);
404 struct kxsd9_state *st = iio_priv(indio_dev); 404 struct kxsd9_state *st = iio_priv(indio_dev);
405 405
406 iio_triggered_buffer_cleanup(indio_dev); 406 iio_triggered_buffer_cleanup(indio_dev);
diff --git a/drivers/iio/accel/kxsd9.h b/drivers/iio/accel/kxsd9.h
index 19131a7a692c..9c0861f6b838 100644
--- a/drivers/iio/accel/kxsd9.h
+++ b/drivers/iio/accel/kxsd9.h
@@ -4,7 +4,7 @@
4#define KXSD9_STATE_RX_SIZE 2 4#define KXSD9_STATE_RX_SIZE 2
5#define KXSD9_STATE_TX_SIZE 2 5#define KXSD9_STATE_TX_SIZE 2
6 6
7int kxsd9_common_probe(struct device *parent, 7int kxsd9_common_probe(struct device *dev,
8 struct regmap *map, 8 struct regmap *map,
9 const char *name); 9 const char *name);
10int kxsd9_common_remove(struct device *parent); 10int kxsd9_common_remove(struct device *dev);