From patchwork Mon Jan 18 17:41:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 8056801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 95C6EBEEE5 for ; Mon, 18 Jan 2016 17:44:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5F642045A for ; Mon, 18 Jan 2016 17:44:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F3C50203AA for ; Mon, 18 Jan 2016 17:44:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aLDou-0003A4-1J; Mon, 18 Jan 2016 17:42:24 +0000 Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aLDob-0002t3-2Q for linux-arm-kernel@lists.infradead.org; Mon, 18 Jan 2016 17:42:06 +0000 Received: by mail-pa0-x232.google.com with SMTP id ho8so176268897pac.2 for ; Mon, 18 Jan 2016 09:41:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=km9ZnQhOcCdodmV44Hcs5fGN32r42jCKV2ME+ACWrhw=; b=rRiwMaUfJa386AU+d+C1+hAJCGbr/e52amu2bwy0Dz6DqQuI6Ah/qYuBcoTzIAz7uy kLcgjK2/fwr31FXrMlKBbX0JP0dfbABsK6AsXwbZlzvqKk/MZWXxxjzwI6MFBnvZRtT2 n+zY1VVvwbkw41fad7DwzpUluISl03xrjUiRhq17z53Tbgt55VGXqQQ4uhCiVtCP2Yat eVdWzRWk+zBUrFkDVhIsW6nkfVFs8+we+ZLbhLDNuujIyyIQbtPfmAAMDlFFzlHxs7nn 2b98onou+K8ziHH0PBK5jdRuZ40sdcaVgSTu6jlJKEtbn8GmokjAPYgE2wZ/SZIU3tU3 0U9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=km9ZnQhOcCdodmV44Hcs5fGN32r42jCKV2ME+ACWrhw=; b=g+O2mULlI2VobkwVrW3PzTBncyMyyd/uG1XE+7Wa0RM0aJU1uR+Q11zn/Cnm6n0zbM 7mxgXFbGICeQlNQcEZds/NbYptE5sOkUCDmijff54SgQLHfZlNHNWLJ0f+AAS+RbMUvd wG5bn371UlKyQrk/pDMs1M0XkKc4hBE+HS7dizwuBS3tFASlEuT5ogpVEwZMkXBKMis2 Guf0PBOyilbiiWQvMV61MQP882orVp7hA8aVlOT5IQbk1UHW+8M0ERe0OLt4d57xferj yU66JkveP57NUavcI+u09woe6UdwyTg57qTE2bK+U0AJuPWg/ssOZb4yX1ThSfVK8QSD pUlA== X-Gm-Message-State: ALoCoQl43/eUe3m6sueW61T1rX318hS50RsRaioA0PLxpTlhQAmPjzds8BkYrBsPdrs0lH/q5726zSM7oapnZtMUHwETzS2g2g== X-Received: by 10.67.1.102 with SMTP id bf6mr38324014pad.103.1453138907169; Mon, 18 Jan 2016 09:41:47 -0800 (PST) Received: from dtor-ws.mtv.corp.google.com ([172.22.64.149]) by smtp.gmail.com with ESMTPSA id o75sm35479881pfi.17.2016.01.18.09.41.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jan 2016 09:41:46 -0800 (PST) From: Dmitry Torokhov To: linux-input@vger.kernel.org, =?UTF-8?q?Timo=20Ter=C3=A4s?= , Daniel Mack Subject: [PATCH 3/4] Input: rotary_encoder - use input_set_capability() Date: Mon, 18 Jan 2016 09:41:41 -0800 Message-Id: <1453138902-11657-4-git-send-email-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1453138902-11657-1-git-send-email-dmitry.torokhov@gmail.com> References: <1453138902-11657-1-git-send-email-dmitry.torokhov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160118_094205_426245_8F7B4D71 X-CRM114-Status: GOOD ( 10.76 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Jarzmik , linux-arm-kernel@lists.infradead.org, Haojian Zhuang , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, 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 Instead of manipulating capability bits directly let's use appropriate helpers. Also there is no need to explicitly set EV_ABS when calling input_set_abs_params(). Signed-off-by: Dmitry Torokhov --- drivers/input/misc/rotary_encoder.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c index e913bfb64..1882e65 100644 --- a/drivers/input/misc/rotary_encoder.c +++ b/drivers/input/misc/rotary_encoder.c @@ -318,14 +318,10 @@ static int rotary_encoder_probe(struct platform_device *pdev) input->id.bustype = BUS_HOST; input->dev.parent = dev; - if (pdata->relative_axis) { - input->evbit[0] = BIT_MASK(EV_REL); - input->relbit[0] = BIT_MASK(pdata->axis); - } else { - input->evbit[0] = BIT_MASK(EV_ABS); - input_set_abs_params(encoder->input, - pdata->axis, 0, pdata->steps, 0, 1); - } + if (pdata->relative_axis) + input_set_capability(input, EV_REL, pdata->axis); + else + input_set_abs_params(input, pdata->axis, 0, pdata->steps, 0, 1); switch (pdata->steps_per_period) { case 4: