summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorLukáš Korenčik <xkorenc1@fi.muni.cz>2017-07-28 12:30:48 +0200
committerMartin K. Petersen <martin.petersen@oracle.com>2017-08-10 19:36:53 -0400
commitbc46427e807eb68e04a63ce044d21ee7c3079614 (patch)
tree65cb3d3bd675614b378de1defaea8422d2309a18 /drivers/s390
parent7d91869c73f8d4ec905903a5c61ba2b5eb1e7164 (diff)
downloadlinux-bc46427e807eb68e04a63ce044d21ee7c3079614.tar.gz
linux-bc46427e807eb68e04a63ce044d21ee7c3079614.tar.bz2
linux-bc46427e807eb68e04a63ce044d21ee7c3079614.zip
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 <xkorenc1@fi.muni.cz> Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Benjamin Block <bblock@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/scsi/zfcp_erp.c5
1 files changed, 2 insertions, 3 deletions
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);
}