summaryrefslogtreecommitdiff
path: root/drivers/scsi/cxgbi/cxgb3i
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-23 09:40:42 +0200
committerKees Cook <keescook@chromium.org>2017-11-21 16:35:54 -0800
commit841b86f3289dbe858daeceec36423d4ea286fac2 (patch)
tree332a53d6045914798e364a534fe3a47cab56d803 /drivers/scsi/cxgbi/cxgb3i
parent919b250f8570618e84af544c3e18dad5210eb9b6 (diff)
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
With all callbacks converted, and the timer callback prototype switched over, the TIMER_FUNC_TYPE cast is no longer needed, so remove it. Conversion was done with the following scripts: perl -pi -e 's|\(TIMER_FUNC_TYPE\)||g' \ $(git grep TIMER_FUNC_TYPE | cut -d: -f1 | sort -u) perl -pi -e 's|\(TIMER_DATA_TYPE\)||g' \ $(git grep TIMER_DATA_TYPE | cut -d: -f1 | sort -u) The now unused macros are also dropped from include/linux/timer.h. Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'drivers/scsi/cxgbi/cxgb3i')
-rw-r--r--drivers/scsi/cxgbi/cxgb3i/cxgb3i.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
index babd79361a46..bf07735275a4 100644
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
@@ -586,8 +586,8 @@ static int do_act_open_rpl(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
cxgbi_sock_get(csk);
spin_lock_bh(&csk->lock);
if (rpl->status == CPL_ERR_CONN_EXIST &&
- csk->retry_timer.function != (TIMER_FUNC_TYPE)act_open_retry_timer) {
- csk->retry_timer.function = (TIMER_FUNC_TYPE)act_open_retry_timer;
+ csk->retry_timer.function != act_open_retry_timer) {
+ csk->retry_timer.function = act_open_retry_timer;
mod_timer(&csk->retry_timer, jiffies + HZ / 2);
} else
cxgbi_sock_fail_act_open(csk,