Commit 154021a3 authored by Linus Walleij's avatar Linus Walleij Committed by Jonathan Cameron

iio: accel: kxsd9: split out a common remove() function

This makes it possible to later split the transport mechanism
using a generic probe() and a generic remove().

Use dev_set_drvdata() and dev_get_drvdata() as a paired
accessor to operate on the abstract struct device * regardless
of the transport mechanism in use.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 9f907972
...@@ -220,8 +220,7 @@ static const struct iio_info kxsd9_info = { ...@@ -220,8 +220,7 @@ static const struct iio_info kxsd9_info = {
static int kxsd9_common_probe(struct device *parent, static int kxsd9_common_probe(struct device *parent,
struct kxsd9_transport *transport, struct kxsd9_transport *transport,
const char *name, const char *name)
struct iio_dev **retdev)
{ {
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct kxsd9_state *st; struct kxsd9_state *st;
...@@ -248,7 +247,17 @@ static int kxsd9_common_probe(struct device *parent, ...@@ -248,7 +247,17 @@ static int kxsd9_common_probe(struct device *parent,
if (ret) if (ret)
return ret; return ret;
*retdev = indio_dev; dev_set_drvdata(parent, indio_dev);
return 0;
}
static int kxsd9_common_remove(struct device *parent)
{
struct iio_dev *indio_dev = dev_get_drvdata(parent);
iio_device_unregister(indio_dev);
return 0; return 0;
} }
...@@ -295,7 +304,6 @@ static int kxsd9_spi_readval(struct kxsd9_transport *tr, u8 address) ...@@ -295,7 +304,6 @@ static int kxsd9_spi_readval(struct kxsd9_transport *tr, u8 address)
static int kxsd9_spi_probe(struct spi_device *spi) static int kxsd9_spi_probe(struct spi_device *spi)
{ {
struct kxsd9_transport *transport; struct kxsd9_transport *transport;
struct iio_dev *indio_dev;
int ret; int ret;
transport = devm_kzalloc(&spi->dev, sizeof(*transport), GFP_KERNEL); transport = devm_kzalloc(&spi->dev, sizeof(*transport), GFP_KERNEL);
...@@ -311,20 +319,16 @@ static int kxsd9_spi_probe(struct spi_device *spi) ...@@ -311,20 +319,16 @@ static int kxsd9_spi_probe(struct spi_device *spi)
ret = kxsd9_common_probe(&spi->dev, ret = kxsd9_common_probe(&spi->dev,
transport, transport,
spi_get_device_id(spi)->name, spi_get_device_id(spi)->name);
&indio_dev);
if (ret) if (ret)
return ret; return ret;
spi_set_drvdata(spi, indio_dev);
return 0; return 0;
} }
static int kxsd9_spi_remove(struct spi_device *spi) static int kxsd9_spi_remove(struct spi_device *spi)
{ {
iio_device_unregister(spi_get_drvdata(spi)); return kxsd9_common_remove(&spi->dev);
return 0;
} }
static const struct spi_device_id kxsd9_spi_id[] = { static const struct spi_device_id kxsd9_spi_id[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment