Skip to content

Commit

Permalink
iio: accel: kxsd9: Replace "parent" with "dev"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Walleij authored and Jonathan Cameron committed Sep 18, 2016
1 parent 2bb4a02 commit 79383aa
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions drivers/iio/accel/kxsd9.c
Original file line number Diff line number Diff line change
Expand Up @@ -335,38 +335,38 @@ static const struct iio_info kxsd9_info = {
/* Four channels apart from timestamp, scan mask = 0x0f */
static const unsigned long kxsd9_scan_masks[] = { 0xf, 0 };

int kxsd9_common_probe(struct device *parent,
int kxsd9_common_probe(struct device *dev,
struct regmap *map,
const char *name)
{
struct iio_dev *indio_dev;
struct kxsd9_state *st;
int ret;

indio_dev = devm_iio_device_alloc(parent, sizeof(*st));
indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
if (!indio_dev)
return -ENOMEM;

st = iio_priv(indio_dev);
st->dev = parent;
st->dev = dev;
st->map = map;

indio_dev->channels = kxsd9_channels;
indio_dev->num_channels = ARRAY_SIZE(kxsd9_channels);
indio_dev->name = name;
indio_dev->dev.parent = parent;
indio_dev->dev.parent = dev;
indio_dev->info = &kxsd9_info;
indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->available_scan_masks = kxsd9_scan_masks;

/* Fetch and turn on regulators */
st->regs[0].supply = kxsd9_reg_vdd;
st->regs[1].supply = kxsd9_reg_iovdd;
ret = devm_regulator_bulk_get(parent,
ret = devm_regulator_bulk_get(dev,
ARRAY_SIZE(st->regs),
st->regs);
if (ret) {
dev_err(parent, "Cannot get regulators\n");
dev_err(dev, "Cannot get regulators\n");
return ret;
}

Expand All @@ -377,15 +377,15 @@ int kxsd9_common_probe(struct device *parent,
kxsd9_trigger_handler,
NULL);
if (ret) {
dev_err(parent, "triggered buffer setup failed\n");
dev_err(dev, "triggered buffer setup failed\n");
goto err_power_down;
}

ret = iio_device_register(indio_dev);
if (ret)
goto err_cleanup_buffer;

dev_set_drvdata(parent, indio_dev);
dev_set_drvdata(dev, indio_dev);

return 0;

Expand All @@ -398,9 +398,9 @@ int kxsd9_common_probe(struct device *parent,
}
EXPORT_SYMBOL(kxsd9_common_probe);

int kxsd9_common_remove(struct device *parent)
int kxsd9_common_remove(struct device *dev)
{
struct iio_dev *indio_dev = dev_get_drvdata(parent);
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct kxsd9_state *st = iio_priv(indio_dev);

iio_triggered_buffer_cleanup(indio_dev);
Expand Down
4 changes: 2 additions & 2 deletions drivers/iio/accel/kxsd9.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#define KXSD9_STATE_RX_SIZE 2
#define KXSD9_STATE_TX_SIZE 2

int kxsd9_common_probe(struct device *parent,
int kxsd9_common_probe(struct device *dev,
struct regmap *map,
const char *name);
int kxsd9_common_remove(struct device *parent);
int kxsd9_common_remove(struct device *dev);

0 comments on commit 79383aa

Please sign in to comment.