Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / drivers / rtc / rtc-max8997.c

diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c
index dacf48db792593305961fbf10cb830de183d1926..0777c01b58e09b6d51e31f4e5929ae6ede021ffe 100644 (file)
--- a/drivers/rtc/rtc-max8997.c
+++ b/drivers/rtc/rtc-max8997.c
@@ -104,7 +104,7 @@ static int max8997_rtc_tm_to_data(struct rtc_time *tm, u8 *data)
        data[RTC_WEEKDAY] = 1 << tm->tm_wday;
        data[RTC_DATE] = tm->tm_mday;
        data[RTC_MONTH] = tm->tm_mon + 1;
-       data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0 ;
+       data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0;
 
        if (tm->tm_year < 100) {
                pr_warn("%s: MAX8997 RTC cannot handle the year %d."
@@ -507,11 +507,6 @@ err_out:
        return ret;
 }
 
-static int max8997_rtc_remove(struct platform_device *pdev)
-{
-       return 0;
-}
-
 static void max8997_rtc_shutdown(struct platform_device *pdev)
 {
        struct max8997_rtc_info *info = platform_get_drvdata(pdev);
@@ -531,7 +526,6 @@ static struct platform_driver max8997_rtc_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = max8997_rtc_probe,
-       .remove         = max8997_rtc_remove,
        .shutdown       = max8997_rtc_shutdown,
        .id_table       = rtc_id,
 };