From patchwork Thu Oct 31 07:26:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kang Hu X-Patchwork-Id: 3119351 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9946BBF924 for ; Thu, 31 Oct 2013 07:30:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B65C520383 for ; Thu, 31 Oct 2013 07:29:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED23F2037D for ; Thu, 31 Oct 2013 07:29:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752940Ab3JaH3k (ORCPT ); Thu, 31 Oct 2013 03:29:40 -0400 Received: from mail-pb0-f49.google.com ([209.85.160.49]:39121 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752958Ab3JaH3Z (ORCPT ); Thu, 31 Oct 2013 03:29:25 -0400 Received: by mail-pb0-f49.google.com with SMTP id xb4so2408690pbc.8 for ; Thu, 31 Oct 2013 00:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PdqlMHtEqN58SqINSlzIC4ssskHgMXqnjWK/1AmFdd4=; b=PG+87mFQl8MqEbSmvThwms+8YgpTKdEsVeiZ/us+LDM4A0OxmpTpOhgO/fTM8CzrhJ +CTlMY8123m8Xfba5L3bJkHRCIopKW4SDzHfYZczYVkxr5FtPAv9Wk5NBL15V1EPS1Tv DA3mpoIutC0s9mXMvFbOa5q6S5mIWv4ucszYEv3MAgdujOHf63n+F2OLJM5ryn73C2hb Qi4NBO0S29R68j/1Myxi99V1uxNCkgfFAW69gCMXBVeSb4fyXL0t9LDR3onuaBp7yW1V fqRn0EREaSD6BFnbisMPKQT6pdLF96YW4Ygtv29d6Q1s/+xsvVQyrKj1JqqPtkO+tAx6 GJBQ== X-Received: by 10.68.250.196 with SMTP id ze4mr381120pbc.144.1383204565277; Thu, 31 Oct 2013 00:29:25 -0700 (PDT) Received: from fedoracat.localdomain ([36.63.137.7]) by mx.google.com with ESMTPSA id rp8sm2126021pbc.25.2013.10.31.00.29.20 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 31 Oct 2013 00:29:24 -0700 (PDT) From: Kang Hu To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Kang Hu Subject: [PATCH 1/1] Input: remove a redundant max() call. Date: Thu, 31 Oct 2013 15:26:34 +0800 Message-Id: <1383204394-15399-1-git-send-email-hukangustc@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP dev->hint_events_per_packet is guaranteed to be >= packet_size. so an extra max() call is not needed. Signed-off-by: Kang Hu --- drivers/input/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/input.c b/drivers/input/input.c index c044699..fb513da 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -2048,7 +2048,7 @@ int input_register_device(struct input_dev *dev) if (dev->hint_events_per_packet < packet_size) dev->hint_events_per_packet = packet_size; - dev->max_vals = max(dev->hint_events_per_packet, packet_size) + 2; + dev->max_vals = dev->hint_events_per_packet + 2; dev->vals = kcalloc(dev->max_vals, sizeof(*dev->vals), GFP_KERNEL); if (!dev->vals) { error = -ENOMEM;