From patchwork Tue Jun 19 14:14:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 139129 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5261235lji; Tue, 19 Jun 2018 07:14:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIZIshYoULelY0NVgODhz66Zss4cDzUfkHKs/EAoqjhhzEvIHg8GPaWn24XkayGgVhWt4Ne X-Received: by 2002:a62:fcb:: with SMTP id 72-v6mr18280622pfp.231.1529417688281; Tue, 19 Jun 2018 07:14:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529417688; cv=none; d=google.com; s=arc-20160816; b=Ys/URvIa6N83+yp5nM9Ircmm/tljCMo5xgM0mc+ufauwsphEfOFbmR8V1qKuMB7XQu yFhxnMW9wLLTXEb32YBjA8ONhV7OjlVqrHhqmS7veMwKnARnjBtMXHPQV+/UQVwBKmPb sGLaJt/g9bk7c1jXXmf+yfEPyBf7AWRV4X5JSxrIffEzovpu1ePr5rZ6p1RtccyMnfVe Yh/kkIPKq0AV+5xeIXnnPq8n+Ie1I7PkXDuAlMvwuBvClIsSxVS1Kn2SbRLqzHT0+04B ogxeQXcRYVs36GC5YNni9cnyOm7bbJuFdbhrr+JaRYG+9p+o55rd9xTf4zA1vbJDpTfh mCkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=yiHrwybgDoD6NSTa+4Xvi6OKaWvrnBtV7FJFuea5AcM=; b=kL+TwQvBgrGusy6F58aZg4SXDmhUMfetrC7PyYbnyit56XAVBr9CH2ynxlOsRSYS06 ua/6njD3kvlm8q09q9ADyv8LiYFG5hJv1nGw4HaXEFOw3he6/bLFuK7raezaMv/vgycg 3s1qYYBNV/XbL6uJ3saTMY/JheqrmLuA/dpFPey2uQkThLcncr7k+wj+IjSN7enEhfCR OD+06PCyitqa5W0Tay0gq6xqbgpt2wsKLB15WIixT+VfMiwSd9ssM6wMdmxNgKpTf+M/ OlvDagmqhBiBMv8Ob//2C/KO2MHxkGTWWqa525Yi1hAusaNK1v/SBaZx172s9+8iz0SM c1FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D8EdfLn0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n7-v6si17941041pfn.270.2018.06.19.07.14.47; Tue, 19 Jun 2018 07:14:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D8EdfLn0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937571AbeFSOOp (ORCPT + 30 others); Tue, 19 Jun 2018 10:14:45 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:51246 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750816AbeFSOOn (ORCPT ); Tue, 19 Jun 2018 10:14:43 -0400 Received: by mail-wm0-f67.google.com with SMTP id r15-v6so672442wmc.1 for ; Tue, 19 Jun 2018 07:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=yiHrwybgDoD6NSTa+4Xvi6OKaWvrnBtV7FJFuea5AcM=; b=D8EdfLn0nYXTOflE+hqV5fiz2HL1otIOUF2Fwx1u5xtkT4KeetE0wJahH+T1gK7Z7L IbLFA/ZJDPwMpfPOiWBFTR6mwsSiYxOJDG7cYAOE5L+2s1nJCztt3OTrlJok4RYlgd4j kYd/vULDRpOJI4+FaGw6aF7Sh6P6BT4stW7vI= 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; bh=yiHrwybgDoD6NSTa+4Xvi6OKaWvrnBtV7FJFuea5AcM=; b=jHxuWOll3F7/Fm9Zom8/zv2FUNcFE0491qr6Dx3z+uofMxVJdued1TxcstRj/IJDVo lL0QYrw89+ABz0oL+0fsGEB6qnqvnToVnSMum91ry9EfBSpat6FjFXUETZ3wNIX9uRbz LXdZlCJlKlB5UTgGS4hw0bki6Pau+/rSrgltLEgGzCfN9e1zjZs4ZlkCN7yQxKhZ6uu7 LWMXUVtaZ1aOG2w6Yx0NHaGWXkqBdTgS7xV1lM+mRJHBBOw1lF6ZFpJW35i16Rm+jeI7 QmqPbnK/50IEYtkNNSi0Y1TYjGxYpYajKtWHYHbufEct+aGesXQG1u9tgOSOnkzSOKfd vThw== X-Gm-Message-State: APt69E2NOrHZvMsYZpe/wUIQNJm1VObagbGTDOJBkoLzjmWbiLAVShHh CJauJYTyt+Xblhxb5gkiN1W9/Q== X-Received: by 2002:a1c:a54e:: with SMTP id o75-v6mr12472752wme.157.1529417682402; Tue, 19 Jun 2018 07:14:42 -0700 (PDT) Received: from mai.localdomain (135-224-190-109.dsl.ovh.fr. [109.190.224.135]) by smtp.gmail.com with ESMTPSA id 12-v6sm293197wmt.19.2018.06.19.07.14.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Jun 2018 07:14:41 -0700 (PDT) From: Daniel Lezcano To: oliver@neukum.org Cc: "David S. Miller" , linux-usb@vger.kernel.org (open list:USB CDC ETHERNET DRIVER), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] net/usb/drivers: Remove useless hrtimer_active check Date: Tue, 19 Jun 2018 16:14:30 +0200 Message-Id: <1529417671-21384-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The code does: if (hrtimer_active(&t)) hrtimer_cancel(&t); However, hrtimer_cancel() checks if the timer is active, so the test above is pointless. Signed-off-by: Daniel Lezcano --- drivers/net/usb/cdc_ncm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 90d07ed..732ceff 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -967,8 +967,7 @@ void cdc_ncm_unbind(struct usbnet *dev, struct usb_interface *intf) atomic_set(&ctx->stop, 1); - if (hrtimer_active(&ctx->tx_timer)) - hrtimer_cancel(&ctx->tx_timer); + hrtimer_cancel(&ctx->tx_timer); tasklet_kill(&ctx->bh);