diff options
| author |   Jean-Baptiste Maneyrol <jmaneyrol@invensense.com> | 2018-04-23 12:33:31 +0200 |
|---|---|---|
| committer |   Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2018-04-28 16:53:26 +0100 |
| commit | 57f1677bd7629792d58915cfe15e09eef2e22c84 (patch) | |
| tree | 673e230b059da8f81472358a893dc376962136af /drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | |
| parent | iio: imu: inv_mpu6050: fix error path not turning chip back off (diff) | |
| download | wireguard-linux-57f1677bd7629792d58915cfe15e09eef2e22c84.tar.xz wireguard-linux-57f1677bd7629792d58915cfe15e09eef2e22c84.zip | |
iio: imu: inv_mpu6050: use devm_* at init and delete remove
Use devm_* for iio_triggered_buffer_setup, iio_device_register,
iio_trigger_register. Delete unneeded inv_mpu6050_remove_trigger,
inv_mpu_core_remove, and inv_mpu_remove for spi driver.
Signed-off-by: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c')
| -rw-r--r-- | drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c index 27e777c58bbe..90fdc5eaef53 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c @@ -129,14 +129,12 @@ static int inv_mpu_probe(struct i2c_client *client, 1, 0, I2C_MUX_LOCKED | I2C_MUX_GATE, inv_mpu6050_select_bypass, inv_mpu6050_deselect_bypass); - if (!st->muxc) { - result = -ENOMEM; - goto out_unreg_device; - } + if (!st->muxc) + return -ENOMEM; st->muxc->priv = dev_get_drvdata(&client->dev); result = i2c_mux_add_adapter(st->muxc, 0, 0, 0); if (result) - goto out_unreg_device; + return result; result = inv_mpu_acpi_create_mux_client(client); if (result) @@ -146,8 +144,6 @@ static int inv_mpu_probe(struct i2c_client *client, out_del_mux: i2c_mux_del_adapters(st->muxc); -out_unreg_device: - inv_mpu_core_remove(&client->dev); return result; } @@ -159,7 +155,7 @@ static int inv_mpu_remove(struct i2c_client *client) inv_mpu_acpi_delete_mux_client(client); i2c_mux_del_adapters(st->muxc); - return inv_mpu_core_remove(&client->dev); + return 0; } /* |