Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752096AbdHaXkh (ORCPT ); Thu, 31 Aug 2017 19:40:37 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33121 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751537AbdHaXjY (ORCPT ); Thu, 31 Aug 2017 19:39:24 -0400 X-Google-Smtp-Source: ADKCNb5/KRnWO/pB5LTbGT4g9/LZW8EiD4dSTOGZ0jXkhdrRl67ObbXzKaqvwXTfyfGneEszP5YTSQ== From: Kees Cook To: Thomas Gleixner Cc: Kees Cook , Dennis Dalessandro , Doug Ledford , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 28/31] infiniband/rdmavt: Remove redundant timer initialization Date: Thu, 31 Aug 2017 16:29:40 -0700 Message-Id: <1504222183-61202-29-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504222183-61202-1-git-send-email-keescook@chromium.org> References: <1504222183-61202-1-git-send-email-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 979 Lines: 28 setup_timer() is already called before the open-coded init_timer() and .data assignment. Remove it. Cc: Dennis Dalessandro Cc: Doug Ledford Cc: Sean Hefty Cc: Hal Rosenstock Cc: linux-rdma@vger.kernel.org Signed-off-by: Kees Cook --- drivers/infiniband/sw/rdmavt/qp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c index 8876ee7bc326..6b95cdb6c517 100644 --- a/drivers/infiniband/sw/rdmavt/qp.c +++ b/drivers/infiniband/sw/rdmavt/qp.c @@ -789,8 +789,6 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd, atomic_set(&qp->refcount, 0); atomic_set(&qp->local_ops_pending, 0); init_waitqueue_head(&qp->wait); - init_timer(&qp->s_timer); - qp->s_timer.data = (unsigned long)qp; INIT_LIST_HEAD(&qp->rspwait); qp->state = IB_QPS_RESET; qp->s_wq = swq; -- 2.7.4