Merge v3.13-rc2 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / iio / adc / mcp3422.c

diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
index c8c1baaec6c1bf7b590e144c79a6b73efbf13af2..47dcb34ff44c47f6317a62c99e025df6eb6b27f6 100644 (file)
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
@@ -362,7 +362,7 @@ static int mcp3422_probe(struct i2c_client *client,
                | MCP3422_SAMPLE_RATE_VALUE(MCP3422_SRATE_240));
        mcp3422_update_config(adc, config);
 
-       err = iio_device_register(indio_dev);
+       err = devm_iio_device_register(&client->dev, indio_dev);
        if (err < 0)
                return err;
 
@@ -371,12 +371,6 @@ static int mcp3422_probe(struct i2c_client *client,
        return 0;
 }
 
-static int mcp3422_remove(struct i2c_client *client)
-{
-       iio_device_unregister(i2c_get_clientdata(client));
-       return 0;
-}
-
 static const struct i2c_device_id mcp3422_id[] = {
        { "mcp3422", 2 },
        { "mcp3423", 3 },
@@ -400,7 +394,6 @@ static struct i2c_driver mcp3422_driver = {
                .of_match_table = of_match_ptr(mcp3422_of_match),
        },
        .probe = mcp3422_probe,
-       .remove = mcp3422_remove,
        .id_table = mcp3422_id,
 };
 module_i2c_driver(mcp3422_driver);