Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-rx4581.c

diff --git a/drivers/rtc/rtc-rx4581.c b/drivers/rtc/rtc-rx4581.c
index 84eb08d65d3053ee200bfec8d6736d1456518d5b..6889222f9ed64e8f991047aca26dfdcc30fd2d73 100644 (file)
--- a/drivers/rtc/rtc-rx4581.c
+++ b/drivers/rtc/rtc-rx4581.c
@@ -282,11 +282,6 @@ static int rx4581_probe(struct spi_device *spi)
        return 0;
 }
 
-static int rx4581_remove(struct spi_device *spi)
-{
-       return 0;
-}
-
 static const struct spi_device_id rx4581_id[] = {
        { "rx4581", 0 },
        { }
@@ -299,7 +294,6 @@ static struct spi_driver rx4581_driver = {
                .owner  = THIS_MODULE,
        },
        .probe  = rx4581_probe,
-       .remove = rx4581_remove,
        .id_table = rx4581_id,
 };