From: Lukáš Korenčik Date: Fri, 28 Jul 2017 10:30:48 +0000 (+0200) Subject: scsi: zfcp: use setup_timer instead of init_timer X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bc46427e807eb68e04a63ce044d21ee7c3079614;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git scsi: zfcp: use setup_timer instead of init_timer Use initialization with setup_timer function instead of using init_timer function and data fields. It improves readability. Signed-off-by: Lukáš Korenčik Signed-off-by: Jiri Slaby Signed-off-by: Benjamin Block Signed-off-by: Martin K. Petersen --- diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 7ccfce559034..37408f5f81ce 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c @@ -572,9 +572,8 @@ static void zfcp_erp_memwait_handler(unsigned long data) static void zfcp_erp_strategy_memwait(struct zfcp_erp_action *erp_action) { - init_timer(&erp_action->timer); - erp_action->timer.function = zfcp_erp_memwait_handler; - erp_action->timer.data = (unsigned long) erp_action; + setup_timer(&erp_action->timer, zfcp_erp_memwait_handler, + (unsigned long) erp_action); erp_action->timer.expires = jiffies + HZ; add_timer(&erp_action->timer); }