|
@@ -434,23 +434,14 @@ static int adxrs450_probe(struct spi_device *spi)
|
|
indio_dev->num_channels = ARRAY_SIZE(adxrs450_channels);
|
|
indio_dev->num_channels = ARRAY_SIZE(adxrs450_channels);
|
|
indio_dev->name = spi->dev.driver->name;
|
|
indio_dev->name = spi->dev.driver->name;
|
|
|
|
|
|
- ret = iio_device_register(indio_dev);
|
|
|
|
|
|
+ ret = devm_iio_device_register(&spi->dev, indio_dev);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
/* Get the device into a sane initial state */
|
|
/* Get the device into a sane initial state */
|
|
ret = adxrs450_initial_setup(indio_dev);
|
|
ret = adxrs450_initial_setup(indio_dev);
|
|
if (ret)
|
|
if (ret)
|
|
- goto error_initial;
|
|
|
|
- return 0;
|
|
|
|
-error_initial:
|
|
|
|
- iio_device_unregister(indio_dev);
|
|
|
|
- return ret;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-static int adxrs450_remove(struct spi_device *spi)
|
|
|
|
-{
|
|
|
|
- iio_device_unregister(spi_get_drvdata(spi));
|
|
|
|
|
|
+ return ret;
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -468,7 +459,6 @@ static struct spi_driver adxrs450_driver = {
|
|
.owner = THIS_MODULE,
|
|
.owner = THIS_MODULE,
|
|
},
|
|
},
|
|
.probe = adxrs450_probe,
|
|
.probe = adxrs450_probe,
|
|
- .remove = adxrs450_remove,
|
|
|
|
.id_table = adxrs450_id,
|
|
.id_table = adxrs450_id,
|
|
};
|
|
};
|
|
module_spi_driver(adxrs450_driver);
|
|
module_spi_driver(adxrs450_driver);
|