From patchwork Tue Feb 28 22:08:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 9597019 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 BD1C560471 for ; Tue, 28 Feb 2017 22:15:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEE58205F7 for ; Tue, 28 Feb 2017 22:15:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A38A126490; Tue, 28 Feb 2017 22:15:54 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 5D211223B2 for ; Tue, 28 Feb 2017 22:15:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751667AbdB1WPx (ORCPT ); Tue, 28 Feb 2017 17:15:53 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36714 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750957AbdB1WPx (ORCPT ); Tue, 28 Feb 2017 17:15:53 -0500 Received: by mail-pf0-f193.google.com with SMTP id j5so1901068pfb.3; Tue, 28 Feb 2017 14:15:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OIP9Rja1N83sibKaKkXjoqPYcugcyA+mpzIOG0WJdZE=; b=qxpCQg8EGoeTaiOejJ174C80d+Q86an7pjA/4E/ukrWwEO5v2nXaVf8lUzaB9PuW1V xG3Uxe6kUbYppo1IZpm794zJkZSDi1+uj45bvX71LNiLXZJ5vIJAwonvRjzutfLnQEOE /XXi/NpvKDIOAAuRPCZEAiXXPZTYDO7st4FDapE5HAGJX7vmwYY9+gyTrf3XrS5MMJUv QTBBrbqqjRs8JML5DQ+UnNAv+CL5yBa9YiA3CdOzO3gaPazRbC9gAIaa58jQxMlQofYf AVgBUp/g0xYUAwBpVUS05LgTQbg4hlommg0DiFu1+xzoLfZN1uKkN4pY+QCwPreq1xIj LlLg== 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=OIP9Rja1N83sibKaKkXjoqPYcugcyA+mpzIOG0WJdZE=; b=sq8T6II6Wb/76FTQ1FebeMy8Qp0A/pBvNzcBsVsfAbBpQG7ghPOZmd8R9ou+HpGNHN IZ5k1L39cB4CGQu07wY4biyPW5i0cXfI4lNUn+t1I1t+I0yy5QL2XvvRHjgAs+n78oYm ZH5ZOFkVjSmr7mAZw7DYAl9OKUPFXUsFPITOaMc8k50FRZoIgSvYPeM1nnp8NfQa8bgQ z+90qpRid/qbn4PNRpj08cgcCfnwgE5dY8LobkKsL4Dmw6EXDUqw1f4H6ceRpKKtn2Q+ Rb6lCJw/LnRMLuyoLz4PvbfoXTCuDYYLd9iiadbYHGbq/z7/jGmxgczKUbUu3cvt75Hg j75w== X-Gm-Message-State: AMke39kdqYPxE/bJYbu7jp28ymgbqqLPPz4pQ8VNvqErzx0J+EBBmEhHT3RXE7aapLUgKA== X-Received: by 10.84.232.129 with SMTP id i1mr5848730plk.129.1488319732844; Tue, 28 Feb 2017 14:08:52 -0800 (PST) Received: from dtor-ws.mtv.corp.google.com ([172.22.152.34]) by smtp.gmail.com with ESMTPSA id r12sm6125444pgn.26.2017.02.28.14.08.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 14:08:52 -0800 (PST) From: Dmitry Torokhov To: Michael Hennerich Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] Input: ad7879 - do not manipulate capability bits directly Date: Tue, 28 Feb 2017 14:08:48 -0800 Message-Id: <20170228220848.31185-4-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170228220848.31185-1-dmitry.torokhov@gmail.com> References: <20170228220848.31185-1-dmitry.torokhov@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of manipulating capabilities bits of input device directly, let's use input_set_capability() API. Also, stop setting ABS_X/Y bits explicitly as input_set_abs_params() does this for us. Signed-off-by: Dmitry Torokhov Acked-by: Michael Hennerich --- drivers/input/touchscreen/ad7879.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c index c415614ada68..196028c45210 100644 --- a/drivers/input/touchscreen/ad7879.c +++ b/drivers/input/touchscreen/ad7879.c @@ -590,13 +590,7 @@ int ad7879_probe(struct device *dev, struct regmap *regmap, input_set_drvdata(input_dev, ts); - __set_bit(EV_ABS, input_dev->evbit); - __set_bit(ABS_X, input_dev->absbit); - __set_bit(ABS_Y, input_dev->absbit); - __set_bit(ABS_PRESSURE, input_dev->absbit); - - __set_bit(EV_KEY, input_dev->evbit); - __set_bit(BTN_TOUCH, input_dev->keybit); + input_set_capability(input_dev, EV_KEY, BTN_TOUCH); if (pdata) { input_set_abs_params(input_dev, ABS_X, @@ -614,6 +608,7 @@ int ad7879_probe(struct device *dev, struct regmap *regmap, } else { input_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, 0, 0); input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, 0, 0); + input_set_capability(input_dev, EV_ABS, ABS_PRESSURE); touchscreen_parse_properties(input_dev, false, NULL); if (!input_abs_get_max(input_dev, ABS_PRESSURE)) { dev_err(dev, "Touchscreen pressure is not specified\n");