summaryrefslogtreecommitdiff
path: root/drivers/staging/iio/cdc/ad7746.c
diff options
context:
space:
mode:
authorIoana Ciornei <ciorneiioana@gmail.com>2015-10-02 13:37:48 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-04 08:31:07 +0100
commit252fb58ceb42d82931c971b11f5ea1323caa8a35 (patch)
tree465922fefa3ecc8a082c82354415f35f86d0230a /drivers/staging/iio/cdc/ad7746.c
parenta305cf316239073eab9da9ba22266bb698f5c3f7 (diff)
staging: iio: cdc: use devm_iio_device_register instead iio_device_register
Replace iio_device_register with resource managed devm_iio_device_register in order to ease the error path. Also delete de remove function since there is no need after this change. Signed-off-by: Ioana Ciornei <ciorneiioana@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio/cdc/ad7746.c')
-rw-r--r--drivers/staging/iio/cdc/ad7746.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index 10fa372a4182..999c4fa0499d 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -749,7 +749,7 @@ static int ad7746_probe(struct i2c_client *client,
if (ret < 0)
return ret;
- ret = iio_device_register(indio_dev);
+ ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
if (ret)
return ret;
@@ -758,15 +758,6 @@ static int ad7746_probe(struct i2c_client *client,
return 0;
}
-static int ad7746_remove(struct i2c_client *client)
-{
- struct iio_dev *indio_dev = i2c_get_clientdata(client);
-
- iio_device_unregister(indio_dev);
-
- return 0;
-}
-
static const struct i2c_device_id ad7746_id[] = {
{ "ad7745", 7745 },
{ "ad7746", 7746 },
@@ -781,7 +772,6 @@ static struct i2c_driver ad7746_driver = {
.name = KBUILD_MODNAME,
},
.probe = ad7746_probe,
- .remove = ad7746_remove,
.id_table = ad7746_id,
};
module_i2c_driver(ad7746_driver);