From patchwork Thu Aug 31 23:29:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9933087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EC8FA60309 for ; Thu, 31 Aug 2017 23:41:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF6BE268AE for ; Thu, 31 Aug 2017 23:41:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D119726E4E; Thu, 31 Aug 2017 23:41:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5429B268AE for ; Thu, 31 Aug 2017 23:41:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751833AbdHaXkh (ORCPT ); Thu, 31 Aug 2017 19:40:37 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:33121 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751549AbdHaXjY (ORCPT ); Thu, 31 Aug 2017 19:39:24 -0400 Received: by mail-pf0-f169.google.com with SMTP id n73so3230098pfj.0 for ; Thu, 31 Aug 2017 16:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NW0ZXGxUh0MdFU6BiuOfO3FAy1uM9Eq0JQD9ELf17B8=; b=MjE59GEhkD6BNRHsN7fSf0wxVnxj+W3MfsJdtLLUR3sjGn+39R837y7AOYtSZfM/xi /we08xeHFskPa1HzidSlTnAwn7auHmFw0SoF650gHcrX5elbrj3sNhU30RcpfQr8EOIY W29/QgC0eWT6bGt+X0KmvUjRrWR2pzDYlMoMg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NW0ZXGxUh0MdFU6BiuOfO3FAy1uM9Eq0JQD9ELf17B8=; b=Qwgvj/fPpSjvT4vy+EwkGZ2DeJikcPcHn2NBIhZ3wbrNGjlu4WYlRZtM29O8IPxFv2 mJNzA4VngR1FXm9hOR1MlHdbAiI6tQFgAJXzsBq1yz7Id2Yk0AZ//xMbELPKjinb1TpT Y0iKw82WIIcPbbWvisKaR3ZVQUjQ1xdN/DgpBdQHlPN0swJUhMeKo25zmIW6iT4QS3Cn WClGnUEkKLzfwfoJXWLV1Y8h1IMe1jz23CuC4Gel36x+9EAeIMRzmDIWJMvCc/c2E+BC FzwkxyP4IMqkPFJ6tKUvOWCFVc8j2HnMXBYRLSedbejMrlQ1mXdczhvWCF9Yvr2+Tb8m mDKw== X-Gm-Message-State: AHPjjUinNrtrbMhp+6F2lwVTgVf03CukI/U3hNdFhrk+XvIXZdkhkgOT ViqjoMW7vXrMtGur X-Google-Smtp-Source: ADKCNb5/KRnWO/pB5LTbGT4g9/LZW8EiD4dSTOGZ0jXkhdrRl67ObbXzKaqvwXTfyfGneEszP5YTSQ== X-Received: by 10.98.97.134 with SMTP id v128mr127188pfb.259.1504222763941; Thu, 31 Aug 2017 16:39:23 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id 187sm866278pgj.22.2017.08.31.16.39.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 16:39:20 -0700 (PDT) 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-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;