use resource managed devm_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 <[email protected]>

---
 drivers/staging/iio/light/isl29028.c | 11 +----------
 drivers/staging/iio/light/tsl2583.c  | 12 ++----------
 2 files changed, 3 insertions(+), 20 deletions(-)

drivers/staging/iio/light/isl29028.c +1 -10

index cd6f272..32ae112 100644
@@ -513,7 +513,7 @@ static int isl29028_probe(struct i2c_client *client,
        indio_dev->name = id->name;
        indio_dev->dev.parent = &client->dev;
        indio_dev->modes = INDIO_DIRECT_MODE;
-       ret = iio_device_register(indio_dev);
+       ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
        if (ret < 0) {
                dev_err(chip->dev, "iio registration fails with error %d\n",
                        ret);

@@ -522,14 +522,6 @@ static int isl29028_probe(struct i2c_client *client,
        return 0;
 }
 
-static int isl29028_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 isl29028_id[] = {
        {"isl29028", 0},
        {}

@@ -550,7 +542,6 @@ static struct i2c_driver isl29028_driver = {
                .of_match_table = isl29028_of_match,
        },
        .probe   = isl29028_probe,
-       .remove  = isl29028_remove,
        .id_table = isl29028_id,
 };
 

drivers/staging/iio/light/tsl2583.c +1 -8

index b5e1b8b..b2b66c4 100644
@@ -862,7 +862,7 @@ static int taos_probe(struct i2c_client *clientp,
        indio_dev->dev.parent = &clientp->dev;
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->name = chip->client->name;
-       ret = iio_device_register(indio_dev);
+       ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
        if (ret) {
                dev_err(&clientp->dev, "iio registration failed\n");
                return ret;

@@ -917,13 +917,6 @@ static SIMPLE_DEV_PM_OPS(taos_pm_ops, taos_suspend, taos_resume);
 #define TAOS_PM_OPS NULL
 #endif
 
-static int taos_remove(struct i2c_client *client)
-{
-       iio_device_unregister(i2c_get_clientdata(client));
-
-       return 0;
-}
-
 static struct i2c_device_id taos_idtable[] = {
        { "tsl2580", 0 },
        { "tsl2581", 1 },

drivers/staging/iio/light/tsl2583.c +0 -1

 module_i2c_driver(taos_driver);
 
--

2.1.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/803a5566a6126da8fb21617fcc852665bc4dd625.1443729484.git.ciorneiioana%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Use devm_iio_device_register instead of iio_device_register when the remove function is only used to call iio_device_unregister.
Function devm_iio_device_register implicitly calls unregister so there is wqno need to specifically call it

Signed-off-by Ioana Ciornei <[email protected]>

---
 drivers/staging/iio/resolver/ad2s90.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

drivers/staging/iio/resolver/ad2s90.c +1 -10

index e24c589..c57a296 100644
@@ -79,7 +79,7 @@ static int ad2s90_probe(struct spi_device *spi)
        indio_dev->num_channels = 1;
        indio_dev->name = spi_get_device_id(spi)->name;
 
-       ret = iio_device_register(indio_dev);
+       ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
        if (ret)
                return ret;
 

@@ -91,13 +91,6 @@ static int ad2s90_probe(struct spi_device *spi)
        return 0;
 }
 
-static int ad2s90_remove(struct spi_device *spi)
-{
-       iio_device_unregister(spi_get_drvdata(spi));
-
-       return 0;
-}
-
 static const struct spi_device_id ad2s90_id[] = {
        { "ad2s90" },
        {}

@@ -110,7 +103,6 @@ static struct spi_driver ad2s90_driver = {
                .owner = THIS_MODULE,
        },
        .probe = ad2s90_probe,
-       .remove = ad2s90_remove,
        .id_table = ad2s90_id,
 };
 module_spi_driver(ad2s90_driver);
--

2.1.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/41516ac4f917514f14dc5f8469a52aa8b6081818.1443729484.git.ciorneiioana%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

This patchset replaces the use of iio_device_register with
the resource managed function devm_iio_device_register when the remove function only unregisters the device. Since an iio_dev registered with this function is automatically unregistered on driver detach there is no need for the remove function and therefore it is removed.

Ioana Ciornei (3):
staging: iio: cdc: use devm_iio_device_register instead
iio_device_register
staging: iio: light: use devm_iio_device_register instead
iio_device_register
staging: iio: resolver: replace iio_device_register by
devm_iio_device_register

 drivers/staging/iio/cdc/ad7150.c      | 12 +-----------
 drivers/staging/iio/cdc/ad7152.c      | 12 +-----------
 drivers/staging/iio/cdc/ad7746.c      | 12 +-----------
 drivers/staging/iio/light/isl29028.c  | 11 +----------
 drivers/staging/iio/light/tsl2583.c   | 12 ++----------
 drivers/staging/iio/resolver/ad2s90.c | 10 +---------
 6 files changed, 7 insertions(+), 62 deletions(-)

--
2.1.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/cover.1443729484.git.ciorneiioana%40gmail.com.
For more options, visit https://groups.google.com/d/optout.