On 10/29/13 11:39, Sachin Kamat wrote:
> devm_iio_device_register simplifies the code.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
Another device that has lots of control of its power and should be
turning most if not all of it off after the unregister, but isn't...
> ---
> drivers/staging/iio/meter/ade7854-i2c.c | 6 ------
> drivers/staging/iio/meter/ade7854-spi.c | 7 -------
> drivers/staging/iio/meter/ade7854.c | 14 +-------------
> drivers/staging/iio/meter/ade7854.h | 1 -
> 4 files changed, 1 insertion(+), 27 deletions(-)
>
> diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c
> index 5b33c7f..7d913cb 100644
> --- a/drivers/staging/iio/meter/ade7854-i2c.c
> +++ b/drivers/staging/iio/meter/ade7854-i2c.c
> @@ -229,11 +229,6 @@ static int ade7854_i2c_probe(struct i2c_client *client,
> return ret;
> }
>
> -static int ade7854_i2c_remove(struct i2c_client *client)
> -{
> - return ade7854_remove(i2c_get_clientdata(client));
> -}
> -
> static const struct i2c_device_id ade7854_id[] = {
> { "ade7854", 0 },
> { "ade7858", 0 },
> @@ -248,7 +243,6 @@ static struct i2c_driver ade7854_i2c_driver = {
> .name = "ade7854",
> },
> .probe = ade7854_i2c_probe,
> - .remove = ade7854_i2c_remove,
> .id_table = ade7854_id,
> };
> module_i2c_driver(ade7854_i2c_driver);
> diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c
> index 94f73bb..d6a155c 100644
> --- a/drivers/staging/iio/meter/ade7854-spi.c
> +++ b/drivers/staging/iio/meter/ade7854-spi.c
> @@ -300,12 +300,6 @@ static int ade7854_spi_probe(struct spi_device *spi)
> return ret;
> }
>
> -static int ade7854_spi_remove(struct spi_device *spi)
> -{
> - ade7854_remove(spi_get_drvdata(spi));
> -
> - return 0;
> -}
> static const struct spi_device_id ade7854_id[] = {
> { "ade7854", 0 },
> { "ade7858", 0 },
> @@ -321,7 +315,6 @@ static struct spi_driver ade7854_driver = {
> .owner = THIS_MODULE,
> },
> .probe = ade7854_spi_probe,
> - .remove = ade7854_spi_remove,
> .id_table = ade7854_id,
> };
> module_spi_driver(ade7854_driver);
> diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c
> index d620bbd..11a88ae 100644
> --- a/drivers/staging/iio/meter/ade7854.c
> +++ b/drivers/staging/iio/meter/ade7854.c
> @@ -555,24 +555,12 @@ int ade7854_probe(struct iio_dev *indio_dev, struct device *dev)
> /* Get the device into a sane initial state */
> ret = ade7854_initial_setup(indio_dev);
> if (ret)
> - goto error_unreg_dev;
> + return ret;
>
> return 0;
> -
> -error_unreg_dev:
> - iio_device_unregister(indio_dev);
> - return ret;
> }
> EXPORT_SYMBOL(ade7854_probe);
>
> -int ade7854_remove(struct iio_dev *indio_dev)
> -{
> - iio_device_unregister(indio_dev);
> -
> - return 0;
> -}
> -EXPORT_SYMBOL(ade7854_remove);
> -
> MODULE_AUTHOR("Barry Song <21cnbao@xxxxxxxxx>");
> MODULE_DESCRIPTION("Analog Devices ADE7854/58/68/78 Polyphase Energy Meter");
> MODULE_LICENSE("GPL v2");
> diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h
> index 0653457..fac6497 100644
> --- a/drivers/staging/iio/meter/ade7854.h
> +++ b/drivers/staging/iio/meter/ade7854.h
> @@ -169,6 +169,5 @@ struct ade7854_state {
> };
>
> extern int ade7854_probe(struct iio_dev *indio_dev, struct device *dev);
> -extern int ade7854_remove(struct iio_dev *indio_dev);
>
> #endif
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
