From patchwork Mon Aug 19 04:58:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 13767904 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9F6AAC3DA4A for ; Mon, 19 Aug 2024 05:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YN/1Xk9FI8/pPGNyqXKAqL6DAUxzZAXBVprXsawgfYo=; b=kqEduRfYFGBAAKRhWwKbjR3uUa tm1vkBiv/bbJw3OUQb8yONoUIethP/eEkgml9Z0Obz/Y5ykQQ90INrgY6y0x+DRBSTZ9vqzCMAXzR 5fqMfDkDsjVc6UNfIeaLDU5NH/K6I8joadA2ITpcV69OsdevqJQ6Tu0FeZIPGGkN0oNqm1ybhnjJA cYHHu8zC2dz/Dz5xfdujESXtC8qCfQ5x7dSEtkfzbD63ojYiNEoETncJfRk2Wi4G0K8W1tUMOwYUF +ixQV/Cbbrr3YErLcdVzjaRCVd0h6VkllZ8LTVzetIo4Bhhgeked7EnQtEYl1Dksd6baU6YHoAUan o2Sw5ftA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sfuZA-00000000N1D-00Bn; Mon, 19 Aug 2024 05:04:28 +0000 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sfuTU-00000000LYj-2z6k for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 04:58:38 +0000 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-7c691c8f8dcso2544627a12.1 for ; Sun, 18 Aug 2024 21:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724043516; x=1724648316; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YN/1Xk9FI8/pPGNyqXKAqL6DAUxzZAXBVprXsawgfYo=; b=g5cj6T1dMjwLsd07h7PwAoeuoW13MokvVs3RYMwJzZ6MkNZeAlFW87XrrYiv/wZtMi OKagHmoPb6jSaIuzJDvHG1c9fOUREOjWfvvl+lTHFtPm3PE+MZAP5hWcjdsC3vuc3P0B QTHRo2KoA/QE4Xkm7QQgxi28MUEbumLeDuNBUSgaCNG/K55WR6OntwEgDGhsjMfLqjiM Gek5YcIq4nneNzy2RvqUuSocOk10yxDSRZbmqNxIvrwL0sYg6Pww7hF+1Gk99LxxRO0N bXWeaWGae39Ozo035UtZDwmcqslkOyeSQEnsVJ/ZEoxvm9qzgAYwHsUckM0QD3ThsGCb dTnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724043516; x=1724648316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YN/1Xk9FI8/pPGNyqXKAqL6DAUxzZAXBVprXsawgfYo=; b=NBSy+EtzgPC0qqs++U7CB6l9DSaoWnPrrqMjgDkfkmLNUXZy/8nAol9v8Bx/nFE3gN jA4WubQ8KCB74SGkv28zC5qS3/hC6iYQns5wMRkUJcGv1SYpoSm0XmqHZMPEi5AEkzr8 Bdgvgmt7igBskcoe+MXdiScHip66EnWzXxDRdsnt9qpzIIhSZT+PGn5ny6HDqje9aYe3 WS1Ooi1HkLymPhVlnZRvGT54RvyW3hrLm8ZwCD7X9su/9wM43xdf+6i1ipMWXrf5CTVG +v7iPRth0M/xh744qa2l5zs1P5etqOSlf8bJN59tTk3weD8heVx9V6i1RCM+OsR7xEnh dUxg== X-Forwarded-Encrypted: i=1; AJvYcCUfVDCXA3zQ2T+1pxCzG0cS8lEnh08LOpe69IxqPmo46QhDHo+R/7OEKDAN3uf1g/M68lP2ORHyIrr1enWdDB07@lists.infradead.org X-Gm-Message-State: AOJu0YwL3iGzz6AoX+rIHgUbn73F6MrH1wubo4EXvwNp3tt2OJx2ihX7 JC37ur0gDw3AFlcjXo4uMehVTIiAPEhUVFrZUWjqqIcQm1YyAiv4 X-Google-Smtp-Source: AGHT+IHR03pBCS1HkPAq1A4u2Bf9+fNk6P6rh0uFVCEmo/wkeYC6u4wMHRida67w/ccHn9mU0XZ+eQ== X-Received: by 2002:a05:6a20:ce4a:b0:1c3:b2b3:442d with SMTP id adf61e73a8af0-1c90502616dmr10682336637.40.1724043515380; Sun, 18 Aug 2024 21:58:35 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2620:15c:9d:2:4eb5:4500:6efc:6c24]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-202068497b4sm43483445ad.269.2024.08.18.21.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2024 21:58:34 -0700 (PDT) From: Dmitry Torokhov To: Arnd Bergmann , Mark Brown , Krzysztof Kozlowski Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, patches@opensource.cirrus.com Subject: [PATCH 08/14] Input: samsung-keypad - use BIT() and GENMASK() where appropriate Date: Sun, 18 Aug 2024 21:58:05 -0700 Message-ID: <20240819045813.2154642-9-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.46.0.184.g6999bdac58-goog In-Reply-To: <20240819045813.2154642-1-dmitry.torokhov@gmail.com> References: <20240819045813.2154642-1-dmitry.torokhov@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240818_215836_781825_0EADFADE X-CRM114-Status: GOOD ( 13.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Instead of using (1 << ) construct use BIT() helper. Convert (1 << ) - 1 to GENMASK(). Signed-off-by: Dmitry Torokhov --- drivers/input/keyboard/samsung-keypad.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c index ccc1186e43b6..e262137b6838 100644 --- a/drivers/input/keyboard/samsung-keypad.c +++ b/drivers/input/keyboard/samsung-keypad.c @@ -7,6 +7,7 @@ * Author: Donghwa Lee */ +#include #include #include #include @@ -29,11 +30,11 @@ #define SAMSUNG_KEYIFFC 0x10 /* SAMSUNG_KEYIFCON */ -#define SAMSUNG_KEYIFCON_INT_F_EN (1 << 0) -#define SAMSUNG_KEYIFCON_INT_R_EN (1 << 1) -#define SAMSUNG_KEYIFCON_DF_EN (1 << 2) -#define SAMSUNG_KEYIFCON_FC_EN (1 << 3) -#define SAMSUNG_KEYIFCON_WAKEUPEN (1 << 4) +#define SAMSUNG_KEYIFCON_INT_F_EN BIT(0) +#define SAMSUNG_KEYIFCON_INT_R_EN BIT(1) +#define SAMSUNG_KEYIFCON_DF_EN BIT(2) +#define SAMSUNG_KEYIFCON_FC_EN BIT(3) +#define SAMSUNG_KEYIFCON_WAKEUPEN BIT(4) /* SAMSUNG_KEYIFSTSCLR */ #define SAMSUNG_KEYIFSTSCLR_P_INT_MASK (0xff << 0) @@ -81,14 +82,14 @@ static void samsung_keypad_scan(struct samsung_keypad *keypad, unsigned int val; for (col = 0; col < keypad->cols; col++) { - val = SAMSUNG_KEYIFCOL_MASK & ~(1 << col); + val = SAMSUNG_KEYIFCOL_MASK & ~BIT(col); val <<= keypad->chip->column_shift; writel(val, keypad->base + SAMSUNG_KEYIFCOL); mdelay(1); val = readl(keypad->base + SAMSUNG_KEYIFROW); - row_state[col] = ~val & ((1 << keypad->rows) - 1); + row_state[col] = ~val & GENMASK(keypad->rows - 1, 0); } /* KEYIFCOL reg clear */ @@ -112,10 +113,10 @@ static bool samsung_keypad_report(struct samsung_keypad *keypad, continue; for (row = 0; row < keypad->rows; row++) { - if (!(changed & (1 << row))) + if (!(changed & BIT(row))) continue; - pressed = row_state[col] & (1 << row); + pressed = row_state[col] & BIT(row); dev_dbg(&keypad->input_dev->dev, "key %s, row: %d, col: %d\n",