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

[karo-tx-linux.git] / drivers / staging / iio / dac / ad5624r_spi.c

diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
index 6cb00e14422f3f692c747bc044ec252a444c04b6..10c7484366efd96bf07d0ac4ac43b2854a81238e 100644 (file)
--- a/drivers/staging/iio/dac/ad5624r_spi.c
+++ b/drivers/staging/iio/dac/ad5624r_spi.c
@@ -346,18 +346,7 @@ static struct spi_driver ad5624r_driver = {
        .remove = __devexit_p(ad5624r_remove),
        .id_table = ad5624r_id,
 };
-
-static __init int ad5624r_spi_init(void)
-{
-       return spi_register_driver(&ad5624r_driver);
-}
-module_init(ad5624r_spi_init);
-
-static __exit void ad5624r_spi_exit(void)
-{
-       spi_unregister_driver(&ad5624r_driver);
-}
-module_exit(ad5624r_spi_exit);
+module_spi_driver(ad5624r_driver);
 
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices AD5624/44/64R DAC spi driver");