treewide: Switch DEFINE_TIMER callbacks to struct timer_list *

[mirror_ubuntu-bionic-kernel.git] / fs / pstore / platform.c

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 086e491faf04b655e4fdf2903b105a984e788f04..691032107f8c78776668a93ca4c546dc2a46282a 100644 (file)
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -61,7 +61,7 @@ MODULE_PARM_DESC(update_ms, "milliseconds before pstore updates its content "
 
 static int pstore_new_entry;
 
-static void pstore_timefunc(unsigned long);
+static void pstore_timefunc(struct timer_list *);
 static DEFINE_TIMER(pstore_timer, pstore_timefunc);
 
 static void pstore_dowork(struct work_struct *);
@@ -651,7 +651,7 @@ static int pstore_write_user_compat(struct pstore_record *record,
                return -EINVAL;
 
        record->buf = memdup_user(buf, record->size);
-       if (unlikely(IS_ERR(record->buf))) {
+       if (IS_ERR(record->buf)) {
                ret = PTR_ERR(record->buf);
                goto out;
        }
@@ -890,7 +890,7 @@ static void pstore_dowork(struct work_struct *work)
        pstore_get_records(1);
 }
 
-static void pstore_timefunc(unsigned long dummy)
+static void pstore_timefunc(struct timer_list *unused)
 {
        if (pstore_new_entry) {
                pstore_new_entry = 0;