Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / iio / accel / sca3000_core.c

diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 1f30108fdb558dc18c1eba583ebad5472bf18b05..49764fb7181c690d31e6d2e3021d88860483448a 100644 (file)
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -1256,18 +1256,7 @@ static struct spi_driver sca3000_driver = {
        .remove = __devexit_p(sca3000_remove),
        .id_table = sca3000_id,
 };
-
-static __init int sca3000_init(void)
-{
-       return spi_register_driver(&sca3000_driver);
-}
-module_init(sca3000_init);
-
-static __exit void sca3000_exit(void)
-{
-       spi_unregister_driver(&sca3000_driver);
-}
-module_exit(sca3000_exit);
+module_spi_driver(sca3000_driver);
 
 MODULE_AUTHOR("Jonathan Cameron <jic23@cam.ac.uk>");
 MODULE_DESCRIPTION("VTI SCA3000 Series Accelerometers SPI driver");