From patchwork Mon Jul 3 18:52:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115479 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp727735vqx; Mon, 3 Jul 2023 12:01:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlGOpmw2J32l0Xc8CEoJHmdm48bzZrIWXNkobmpjnboBZLeu4RDUN4FnZ+qkMBDeHc0KH6ER X-Received: by 2002:a05:6871:688:b0:1b0:43d6:46ba with SMTP id l8-20020a056871068800b001b043d646bamr9617175oao.2.1688410866216; Mon, 03 Jul 2023 12:01:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410866; cv=none; d=google.com; s=arc-20160816; b=XoCQ2rR20WwZ6QbX+ZHIrcCKGC3dU2yx4zgzzri03X8SbS4ABojXpsMcC6BB0Tp9nm N2Df8CxFGoM1Coboi0YfAG4mlNdgPbxL7VoR67fb5dzIoLoxCTycAAkXHGz894tUdEAm oxduHGWYN1OqhGtCIr7hIHCbd1pJUlL67C0CfOrFGEwt+b1dNBgOAHE3docM0G9avknh 33hfLTourYZqXU5oCKvgWSKeAmupP1O04lA+ts+Q3LbYVi/cXte39LZP3uQbI6TXs1N/ 3EjcK6L3cPf54IfiPB5YcTg/fzxc/I4OnCs8EjdieUtDFUqEAyT4yzz1GqL95Pn8MCTq /6sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wblhJ2xwTtAETN44GhJX0RnubrlOoCR3uewgtDPTiwE=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=Vep5W2PZ8Ya77raFk1z3qoOJ6E+HqVnVj6Qk2It0OkMhRdnVY8+/411cULbXRE2NI7 VJYCN+6nvks1LxxIbA01YSQAbftBw8l3/6kfHevwgtSrHqWE5TQP+x0G7vom8ttWGsM5 jfM5g5xvvHC1Mj5yXs3eeGTe8z6UbpupKKHaRuxFYv27MmanjctsCOnt1pbtYpjVBh64 CxeYvxJFjL05ujFP0FwoFtEgeK3H9ZLrbYLxUzq6PbUfKj5xSXGAWKRKhgLfTm0RE/nR drmjuiuqITzJexWE31IjG6HqHs9exQKiV0hIBRQHCWgYEtcjxh9/9xk/TSw0MNV/O4/c +ORg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KJLvrjEU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 72-20020a17090a09ce00b002634e08d484si9821774pjo.56.2023.07.03.12.00.53; Mon, 03 Jul 2023 12:01:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KJLvrjEU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231316AbjGCSwc (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229989AbjGCSw2 (ORCPT ); Mon, 3 Jul 2023 14:52:28 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1465E72; Mon, 3 Jul 2023 11:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410347; x=1719946347; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0qX8wJqCVwS6J5mYlzsfBNDUlm1C8MXGFzfdUeV0hJg=; b=KJLvrjEU7DE5rusmQtdVhwzMqMwbsTs0TK+ZnOwxBWGaxdu7AYqLbbll WkPjkomkC3IkuIgFaCCZmXAkCi1DXaR8ggJtnjuugOTSRl0JFDm76IaD5 C/lBwftO2apDLJEI1EKegusuYF5+ws49hxqOlJhN/cXh2h7gc2DqYY/Ce T0Z1Yf/Y82lPvjDE21ZOC5e2fgXyMPlX9ndUc0l8uxuTVtyUPlxr73Cba 15B/44Y780fK8wpz/Us2SXk/1tLJUClwXGXNyZIQ6gmQtgtenXztbxAjY 86ypeVhdZkmbL/f15wJ6EimtVUzLUV9W/BBS4B5OsvNGR7WxnEN0+ai44 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="362986956" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="362986956" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="721860810" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="721860810" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 03 Jul 2023 11:52:24 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2803013C; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 01/12] lib/string_choices: Add str_write_read() helper Date: Mon, 3 Jul 2023 21:52:11 +0300 Message-Id: <20230703185222.50554-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770427112581554883?= X-GMAIL-MSGID: =?utf-8?q?1770427112581554883?= Add an inversed variant of str_read_write(), i.e. str_write_read(). Signed-off-by: Andy Shevchenko --- include/linux/string_choices.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/string_choices.h b/include/linux/string_choices.h index 48120222b9b2..3c1091941eb8 100644 --- a/include/linux/string_choices.h +++ b/include/linux/string_choices.h @@ -30,6 +30,7 @@ static inline const char *str_read_write(bool v) { return v ? "read" : "write"; } +#define str_write_read(v) str_read_write(!(v)) static inline const char *str_on_off(bool v) { From patchwork Mon Jul 3 18:52:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115477 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp726246vqx; Mon, 3 Jul 2023 11:58:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6qo1wHstTWrFiL5LRhWnJpzJD0b4U+bQv+QDHO6y8iW60dDvTBo4d2xb8ODf2mz217m6i5 X-Received: by 2002:a05:6a21:3391:b0:125:5f1d:9dbe with SMTP id yy17-20020a056a21339100b001255f1d9dbemr16445666pzb.2.1688410703527; Mon, 03 Jul 2023 11:58:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410703; cv=none; d=google.com; s=arc-20160816; b=nivJG0LRPCoI7VI6nKfL0RtpkQu23QvLyoBZM0obOWuNBZ4T8aXM9rwslxZdvHvbjZ kJRyC9uxMrsM474S+qnhHbcpi1ULQA4czYlKYJwV1Caf5yqmIxdqh8CkxZSTdXW3jyb6 DpwfDZyibdDKNfWjZnKRPVIiwLEg3Z9/6Nq1jELYNydV3W8bm3EgzbEX0qq0PHhK1WYm Bl6fM0gM06nF38yBNtEa/K0e+DRKHpO/IuWFj9uyY3ue0wxiWuSBQj6MlhOsumt++GfQ qqspuR23l0XPYuVwcQ8hCMPPlY1nV3l6RTfVnG3cH3wEdR1TKBh0Yh3Vf1pd9jWYI3YW I01A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lU2TLC5mBJynuf+BQ17huHAiqPCqTYJBTaRbb/JV8bk=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=AKVVdojUW94n+t4JakQghGoRBjCKrC9zSuBg42vttnaOa+cDTVFZuFzpzBm2Qp1v/K tjb++rWSeJPm9N09d36W/nbf8SfT40ZZTX1OpDoRKZ/8e0HI9RvzezrDsTRa9a+82Zav fiVhIEzldcRLj7bdocNgK0MoF3WuIbAwaNllopqm3Q1iezubJNZFC05O3ynRqHvxm0vK JfDJugH/V5m5enTq1vHSy6qtI860Q8MnjTUl6DQOpFfmMsUysl8LzmTHQOa094y677fE JWqeNR3WVPWDJfaIbTy5aM9BKsVG6GcjXNEqzvk3JE3vVPONgeEMc74ezFxDAK1/Eepq 7Oeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kQdjEqQO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t10-20020a63dd0a000000b0054f96f7bcf3si18866449pgg.105.2023.07.03.11.58.09; Mon, 03 Jul 2023 11:58:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kQdjEqQO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231351AbjGCSwf (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230200AbjGCSw2 (ORCPT ); Mon, 3 Jul 2023 14:52:28 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1CABE73; Mon, 3 Jul 2023 11:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410347; x=1719946347; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=z7YG+rldaGnIVAOwR04bpca61wVV/LIPBDGMSpPP1uE=; b=kQdjEqQORu9F5FZGwszkvMck9/fJHKZYaJcwb9dKq+bTWEPkTWr8SMHj SWs2N5jxGj0FlYMLBiDq8oHDabcrhNFNWptcBkit6LfObBfYST+rspO5n LCqckO75JTZJrbYoFrEpykW+albNmeQHWFTXohY29WPxmxAZwL9x4hh4p e5IdLLyAFzpfzQuD1BkWdYrSyIdibU/KW0KjudECHDcx/cDaFb+Up8Bjo WXxjPTdtBn2F25bLKT115oxuwpHYexbBWg2NylULbokzqjldwZwqGTCyg +Lb7KBZf3S3akd9xw3iVBmvUmgjXhWdNhwhLBL2b7mOFi3Uu8sdE6M3ZE w==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="347736200" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="347736200" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="842743323" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="842743323" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 03 Jul 2023 11:52:24 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 337E0177; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 02/12] HID: cp2112: Use str_write_read() and str_read_write() Date: Mon, 3 Jul 2023 21:52:12 +0300 Message-Id: <20230703185222.50554-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770426941745948168?= X-GMAIL-MSGID: =?utf-8?q?1770426941745948168?= Use str_write_read() and str_read_write() from string_choices.h. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 27cadadda7c9..37ccf4714ad1 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "hid-ids.h" @@ -532,15 +533,13 @@ static int cp2112_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, hid_dbg(hdev, "I2C %d messages\n", num); if (num == 1) { + hid_dbg(hdev, "I2C %s %#04x len %d\n", + str_read_write(msgs->flags & I2C_M_RD), msgs->addr, msgs->len); if (msgs->flags & I2C_M_RD) { - hid_dbg(hdev, "I2C read %#04x len %d\n", - msgs->addr, msgs->len); read_length = msgs->len; read_buf = msgs->buf; count = cp2112_read_req(buf, msgs->addr, msgs->len); } else { - hid_dbg(hdev, "I2C write %#04x len %d\n", - msgs->addr, msgs->len); count = cp2112_i2c_write_req(buf, msgs->addr, msgs->buf, msgs->len); } @@ -648,7 +647,7 @@ static int cp2112_xfer(struct i2c_adapter *adap, u16 addr, int ret; hid_dbg(hdev, "%s addr 0x%x flags 0x%x cmd 0x%x size %d\n", - read_write == I2C_SMBUS_WRITE ? "write" : "read", + str_write_read(read_write == I2C_SMBUS_WRITE), addr, flags, command, size); switch (size) { From patchwork Mon Jul 3 18:52:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115472 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp725203vqx; Mon, 3 Jul 2023 11:56:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlFL4iE5+1Xm8eLwL0AGHGdP6tz4VKJdY86brCmq5+KVKdh/5QY2hA2pjTaIyPmhrut6B6nM X-Received: by 2002:aa7:980a:0:b0:677:bb4c:c321 with SMTP id e10-20020aa7980a000000b00677bb4cc321mr12456077pfl.0.1688410569351; Mon, 03 Jul 2023 11:56:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410569; cv=none; d=google.com; s=arc-20160816; b=yZ5xu54AhiJrLrI/pBLHXXMZbNWR8vfQz/ziSr1weEn+yvlUsO/qxxNUTEXxA67W3v 3g6i3t23/LzMk5Z7L0yzUzgbBQJzVENnRb4RIKcNuxD6kqnfb83lPCT+VFJM1jK93Ofj 5inbeyyqEY8fhmHcZOBkaEW+Ua6F5S/I/20zPgYaFuTlolewUcf6VTRkeiRr19uM540e hRILJAcC4b2TKhVg7zLe4WNwu8poLS5qaiMs60D80DEgKYulFVtiKwgAr/Jlci0fbfXO TOOVo0cinKTAZRFlElhz437g/VfPP1t6kgTWBJ7ydRppzzOpfsEGX0nW4+HGRHTxzNOk GDIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HiZeMKM4MZ6XZJC5lisij3jwN9908qgm7404fifuRRU=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=dubKVss7rdvWxqlqq38Ryghm1FTK6IVm7GIFGYTeOxPpn1OLsq4elZiA9PWFSbRaE9 6JzDgBFZCjXns4URd/UqLwEfXzRryvPhP6aja4i92Ykg+eMnEUJkmIMuHFBIz2pyB7jc vGFu2rp/Nhr3auztSSb+l0pthnP2G8guc7bm0EiskT9cDe/cJuK1g+zr/rbuVtPNkQPg RkKpbFqMF52oOl6TIbBF9MjPbqLj8xiV0JFToukQlLxd/Yn/XJlGv4epHnGaGvdicS+H hsC46bMM2KIM9x7TYnJVnwSkft5YIxOzZ1/YLi07oBHzysxMS4jYpzsU5bo1SiKdnMdK PdxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bTdK96Ci; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y30-20020a634b1e000000b0054392750edfsi18450397pga.744.2023.07.03.11.55.53; Mon, 03 Jul 2023 11:56:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bTdK96Ci; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231391AbjGCSwl (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231244AbjGCSw3 (ORCPT ); Mon, 3 Jul 2023 14:52:29 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E22B7E76; Mon, 3 Jul 2023 11:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410347; x=1719946347; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U7xZnxo000Bh+G3CFWHwe0fIvv2SjEV0r+jJ4dVpi6k=; b=bTdK96CiPn+H/CtK0ouYngV++CwKeVhc6dfbIUD7PAyyisTxOOH9nywL GzNAoSu673XfWI6NMMPCtQYTYBUyXKvWiyoWtTVV5m4FnlgQLCDwMqrRX Hja6qbGGbD7nP/rjzj5cIi/gQZhSSYThKbr+tRiLCfcLLi79ljJv49Hck M90xV5UywJLf0Or8XjeaqdzIlwwXG4SZUMyybjZ/QkOPNwR1ZKaM7K8rt JQiAmMib1r6kW766l0WdABs8Ov94wAMfZ4smxGFBWMrUrQ86QWD/cOlfl cDnMbQfeCQ3+G3969PE+Q3HRKBJ2OHY9Jq6gmIABUk+yBGk75NRoRnjpm w==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="362986963" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="362986963" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="721860809" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="721860809" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 03 Jul 2023 11:52:24 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 44AD517C; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 03/12] HID: cp2112: Make irq_chip immutable Date: Mon, 3 Jul 2023 21:52:13 +0300 Message-Id: <20230703185222.50554-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770426801550818781?= X-GMAIL-MSGID: =?utf-8?q?1770426801550818781?= Since recently, the kernel is nagging about mutable irq_chips: "not an immutable chip, please consider fixing it!" Drop the unneeded copy, flag it as IRQCHIP_IMMUTABLE, add the new helper functions and call the appropriate gpiolib functions. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 37ccf4714ad1..51399b231d36 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -164,7 +164,6 @@ struct cp2112_device { atomic_t read_avail; atomic_t xfer_avail; struct gpio_chip gc; - struct irq_chip irq; u8 *in_out_buffer; struct mutex lock; @@ -1079,16 +1078,20 @@ static void cp2112_gpio_irq_mask(struct irq_data *d) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct cp2112_device *dev = gpiochip_get_data(gc); + irq_hw_number_t hwirq = irqd_to_hwirq(d); - __clear_bit(d->hwirq, &dev->irq_mask); + __clear_bit(hwirq, &dev->irq_mask); + gpiochip_disable_irq(gc, hwirq); } static void cp2112_gpio_irq_unmask(struct irq_data *d) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct cp2112_device *dev = gpiochip_get_data(gc); + irq_hw_number_t hwirq = irqd_to_hwirq(d); - __set_bit(d->hwirq, &dev->irq_mask); + gpiochip_enable_irq(gc, hwirq); + __set_bit(hwirq, &dev->irq_mask); } static void cp2112_gpio_poll_callback(struct work_struct *work) @@ -1174,6 +1177,7 @@ static void cp2112_gpio_irq_shutdown(struct irq_data *d) struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct cp2112_device *dev = gpiochip_get_data(gc); + cp2112_gpio_irq_mask(d); cancel_delayed_work_sync(&dev->gpio_poll_worker); } @@ -1227,6 +1231,18 @@ static int __maybe_unused cp2112_allocate_irq(struct cp2112_device *dev, return ret; } +static const struct irq_chip cp2112_gpio_irqchip = { + .name = "cp2112-gpio", + .irq_startup = cp2112_gpio_irq_startup, + .irq_shutdown = cp2112_gpio_irq_shutdown, + .irq_ack = cp2112_gpio_irq_ack, + .irq_mask = cp2112_gpio_irq_mask, + .irq_unmask = cp2112_gpio_irq_unmask, + .irq_set_type = cp2112_gpio_irq_type, + .flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) { struct cp2112_device *dev; @@ -1336,17 +1352,8 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) dev->gc.can_sleep = 1; dev->gc.parent = &hdev->dev; - dev->irq.name = "cp2112-gpio"; - dev->irq.irq_startup = cp2112_gpio_irq_startup; - dev->irq.irq_shutdown = cp2112_gpio_irq_shutdown; - dev->irq.irq_ack = cp2112_gpio_irq_ack; - dev->irq.irq_mask = cp2112_gpio_irq_mask; - dev->irq.irq_unmask = cp2112_gpio_irq_unmask; - dev->irq.irq_set_type = cp2112_gpio_irq_type; - dev->irq.flags = IRQCHIP_MASK_ON_SUSPEND; - girq = &dev->gc.irq; - girq->chip = &dev->irq; + gpio_irq_chip_set_chip(girq, &cp2112_gpio_irqchip); /* The event comes from the outside so no parent handler */ girq->parent_handler = NULL; girq->num_parents = 0; From patchwork Mon Jul 3 18:52:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115478 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp726435vqx; Mon, 3 Jul 2023 11:58:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlEYhZbQgMxy1lfvKHEnb65Cp8D2QSfxiSNFCxWRj2otHP978Pj1RiZpbcAONLViwzWN8Rrg X-Received: by 2002:a17:903:884:b0:1b8:a27d:f591 with SMTP id kt4-20020a170903088400b001b8a27df591mr1024968plb.5.1688410730072; Mon, 03 Jul 2023 11:58:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410730; cv=none; d=google.com; s=arc-20160816; b=nTFbHBCHzqxZog1/TXAZkxGcH1PfvTgl60e5YFRxbKcEmw2pdnQIIo+rGtmsa3meje mlcSfls+nwTzMzO0hg6mv83UPNGslz1p8V8XC4vL7NnJmzIY9W2KPFeTvuIkp/ZVHLCP xV08w2bneF2riHMjB4AQ6tZOB+ZquaX5L8ejYcUaB5w40aNnpiRsM8zzRclMYysCiyU8 kOyRLp0HT4ezOtpunZwIXqs3l8SG4ng3JWBuTqfGJDqNNYXcVePPkURfZROEVRkpTVZR qPMqkP/cZiUpGAzTGhwDVn3zkVCvPG/PMcvCP68IQIYMPiboW7/gfYOUOy0lOKZWvSjF NUVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YgJDGoUZOxxqUPpPhoY2XTp/tSF37oJhkqsj4a/w+Xo=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=M7OId+yCDVz+cgIsp9eMYJ/NKbTwJOsYWAgDFJrAEH7D0asCh6Di9ndJWNHtkBgqUs 2B1RyU4fN8OqOhiGQyq+b309X20znwlFHZ4KvcVIZi6XNP+J7ZWavTg9ufpzCo8qY9/F EeKI9zyOwOlDBC+2CrnytzCRaEpNb3M+S8C8GqwO8Q1T7Frwl0qX+/PqS/DE8rmuLWNT k/MiC+6grCei/UMgJIf6vxsrC5inACL+kGaeAG+BFRHt4PUneEdF9f5SwGpAWR42Dntf 9BQWTsjYcnn8ntHk9WZIVvTAXGQ/beCqk+gHoZ87437V50RfkdRjdMCRPsGs4sYNqkor INRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hvhHGQ6p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kg14-20020a170903060e00b001b87ecb0e5csi5451844plb.126.2023.07.03.11.58.34; Mon, 03 Jul 2023 11:58:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hvhHGQ6p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230395AbjGCSwb (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230391AbjGCSw2 (ORCPT ); Mon, 3 Jul 2023 14:52:28 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65B4EAF; Mon, 3 Jul 2023 11:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410346; x=1719946346; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vglDNwRcSKOGrj0IrUTDI9q4BegirR6oTWfUcwYB95I=; b=hvhHGQ6pBcLzrfrojWdTfuTNXb3IE4OaRkARPiR4eTLUftqkbUUqF2ZO dNOe1qg4X5L1RXZxIJjIBxX92fp+02hcGJWWhULRyHsNwCwY92oxiVrEx ZCLKr24w9MwPUAKyhvm1OrkNZpKUx8vpS5wLDNjMY/ZxOmXD/OkSILUWC hSI1QyDGa9znvuS98TkFwt99bwsN72McFNSz2QrKNlnvI+CNwrA6SQyGN bjH1B3DcOSAfM5s114qJSX3y7fYK46CpyhjQ057Pk0FRUCUFxIWe37BRS 3nU56ZGlym+NtnfzMFWrqClm0f7G69RFfku+VkezB93WkflteSFvk7gWc A==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="362986960" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="362986960" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="721860811" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="721860811" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 03 Jul 2023 11:52:24 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4B284178; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 04/12] HID: cp2112: Switch to for_each_set_bit() to simplify the code Date: Mon, 3 Jul 2023 21:52:14 +0300 Message-Id: <20230703185222.50554-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770426969890080727?= X-GMAIL-MSGID: =?utf-8?q?1770426969890080727?= It's cleaner to use for_each_set_bit() than open coding it. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 51399b231d36..fb4548feb0c8 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -16,6 +16,7 @@ * https://www.silabs.com/documents/public/application-notes/an495-cp2112-interface-specification.pdf */ +#include #include #include #include @@ -1100,7 +1101,6 @@ static void cp2112_gpio_poll_callback(struct work_struct *work) gpio_poll_worker.work); struct irq_data *d; u8 gpio_mask; - u8 virqs = (u8)dev->irq_mask; u32 irq_type; int irq, virq, ret; @@ -1111,11 +1111,7 @@ static void cp2112_gpio_poll_callback(struct work_struct *work) goto exit; gpio_mask = ret; - - while (virqs) { - virq = ffs(virqs) - 1; - virqs &= ~BIT(virq); - + for_each_set_bit(virq, &dev->irq_mask, 8) { if (!dev->gc.to_irq) break; From patchwork Mon Jul 3 18:52:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115476 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp726185vqx; Mon, 3 Jul 2023 11:58:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlEbHlLVSuMkIuNPc/8GbQytOebTYbQYZuAdhZPSwB/Kg5Zw0TuSoJ7+km41E1B4tvh+kXFD X-Received: by 2002:a05:6a00:1da8:b0:67f:7403:1fe8 with SMTP id z40-20020a056a001da800b0067f74031fe8mr13701774pfw.3.1688410695331; Mon, 03 Jul 2023 11:58:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410695; cv=none; d=google.com; s=arc-20160816; b=y8IBEqhFcgfG4FMBPGwSN1P1q1xU9rWD9ou5bxjDpJYVTnvFS8RYKGTcHfonKvI0pA gP9BhLqz/cblIcg4qpmOvyESDc6sCPWmOthNnCU+Ivq66HJB7s7RuRIdxboRCnM67tvp 3nMs0QkZJ7VCA83/DWira54EnpiRzZnk5KfuTcQKjqby+t8oAas6KzVQIRFCMUxFzljC Pe3kI0asXjtuezaqzpRGnjCXz1TKTsQUJU3O2ms0uUUoZ/qCXRxXV+oB/M6NNcD6OHOQ WlUN3VGwDXv0lI7YGlFv3E7ZcvkRnv1xepRfZORPVWcVWPSN1MnaXOqagPtUr5Aqc1Lo mx3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=x/haz0hNgmVCcerTzZEqjbHsjt5n4/QRTGhXC8sue/E=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=OqC82t3w6H5vOyJc4fxjF5BOK48VCJQ296bWd6bjsUKCUlyZTIEpzoSjzZjLXbgCyy Ts7/TsHDWHgD4vkHPEScN8K4VjAwopt1LI0ppE8OuQrxWOUnF+GRUnEhSPcHbs49OYHF hDVPOvVgqSOJUOY44WS+oSSmWBsUCvJ8kO2BzrkHrR/i+Rmq/V+8GqxTVJGXUsVdpxGY hzAOsPIee/5lD3nQlqH78W1a1EN/1rD86uuWnC6QlJKeMe0rP/GspLpvmr67MLWxXna3 ntcIVIKROuSakTy/FCKzVKJTETRUOVtuO0pUZJCulZ7wR25L6khZLDadRPxAeovL861K jC3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bzzqVpwj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o15-20020a056a0015cf00b00677eac1cd9dsi16615906pfu.329.2023.07.03.11.58.01; Mon, 03 Jul 2023 11:58:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bzzqVpwj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231377AbjGCSwh (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231228AbjGCSw3 (ORCPT ); Mon, 3 Jul 2023 14:52:29 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A01BAF; Mon, 3 Jul 2023 11:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410349; x=1719946349; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=afc07R7Fx+NGuUmDJNCCGkFgs3O6oULmTGVDhDPMWbQ=; b=bzzqVpwjjiTMD1+uxU2LXoO3DKd/VKT1zqAUTOFvlP2RGYJegndjPZ+0 8ShCRDnfDFWK63OxPC66DDE0gNP2U9Lh9oSMOosfM/vhSPSooDotmPetn t93qMZtSyzj4swrUbxTrcWcuCHLOnRK+n37UhYS4nHgRxqknCe8UPhPcu 0v2TzWn4utaD7uEteRRDPVnqQPAASeujm9FWEoUGwgKgKBZcvE8MHktJU pm0qUMjU2sYgrPAN5tZ+p3GnkVpATrBfwEUAFOTSD1QQztccAF+0G83v9 oO4XaJBTGpwVYkwEcziM+5yXqqxXAKOMbish9IjR58VOjAtQYc6EE6A+B w==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="362986966" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="362986966" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="721860813" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="721860813" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 03 Jul 2023 11:52:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 631041D9; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 05/12] HID: cp2112: Don't call ->to_irq() explicitly Date: Mon, 3 Jul 2023 21:52:15 +0300 Message-Id: <20230703185222.50554-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770426933423622543?= X-GMAIL-MSGID: =?utf-8?q?1770426933423622543?= GPIO library guarantees that ->to_irq() is always exists. Moreover, it tending to become a nische thingy and has to not be used in ordinary drivers. Hence, replace that by irq_find_mapping(). Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index fb4548feb0c8..15b626359281 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -1112,10 +1112,9 @@ static void cp2112_gpio_poll_callback(struct work_struct *work) gpio_mask = ret; for_each_set_bit(virq, &dev->irq_mask, 8) { - if (!dev->gc.to_irq) - break; - - irq = dev->gc.to_irq(&dev->gc, virq); + irq = irq_find_mapping(dev->gc.irq.domain, virq); + if (!irq) + continue; d = irq_get_irq_data(irq); if (!d) From patchwork Mon Jul 3 18:52:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115470 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp724084vqx; Mon, 3 Jul 2023 11:53:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4YQ6th9nH9DR4jYD/FoObFmnzX5SFU72e61d5LYf+kx7QD1hIGRFrO29ZUtgbK9PiNcbBD X-Received: by 2002:a05:6a20:12cf:b0:112:cf5:d5cc with SMTP id v15-20020a056a2012cf00b001120cf5d5ccmr16849231pzg.1.1688410429287; Mon, 03 Jul 2023 11:53:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410429; cv=none; d=google.com; s=arc-20160816; b=l0rUy8iDLLz0yV7DOi+ffafUOkkdonbamEgs94+O4q/rHWKg/vKoPWHvEM5MwlCo8s NHMsHv8RncoEOCwI2FyB/7OkfC5kPgRR34MsMQpta7I5lW+bJB0wMALYRSuwz11kf6p7 6dW36gxi6IKSKP0ktGE0/BvUiIRbvVtPb3e9nZnWzyCcoL5yuO0RBf0cVt+nRgVYOzD5 AcWC3RcL3QBK5//UyYURSsjySbS+5u1jhX92g1x/aLotC6uPT3fFiOk9IAjsNs5aF9m2 g5ZIpqE7D+3CoNOnzgnxkqSh9urYOjkacKsHpy0myot6hP/Xb1OETulFpqTZPpbX+jpZ ulgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Dcp49SjMpK5DZBd4veeVEi/IMZBG53LjSB3ykyhlsHU=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=vWW75hQ7Awp2LZJ8GZaWeTQ0lTOINVSSk5w0u0babhyNFI4MbkWQ8/tlK8tXEAsDfZ ZwIwjECsJZf/7nPUbI81DDslWSf3/Ew7lj2HcrBhVIeH14/SFoZtFuRfbCHHQPOO1B7r cWw4dJTkdapXLAJ1K6BbbMzVe1lniwua0+MkJnp+pf08aY/7zwZQjXJwtKXzs/Wmkvyf iZ6XhWWRWeZxr+vcSAe2TPdzf0xLIM0ceU/yRPv2HO497goxTRfHUlaMn71089C3PuvV 6bwNu2qmSG+n3b1yPKywWbUdgJ3nQbPmOHa3EL9rPuSgcD5pRQfS9UMVA4nYpDd/rr77 sVBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ROspkP4E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n3-20020a634003000000b0055785ad71c5si18097120pga.599.2023.07.03.11.53.34; Mon, 03 Jul 2023 11:53:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ROspkP4E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231382AbjGCSwp (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231302AbjGCSwc (ORCPT ); Mon, 3 Jul 2023 14:52:32 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DE16E64; Mon, 3 Jul 2023 11:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410351; x=1719946351; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=m3oT3A2TkcRcs3tLyPA7LqOUifp3itwdNBboGdNimiQ=; b=ROspkP4EJUVMRRMfWVfx0z6phDsXwlENCBMxCjjZtjvtu2UROuwo0EG/ DqzYG3ZURn9LL82cvm3dZhFOLCvNrIJiZ/q8EPda2rrAOallb/Sx0LP/7 vBTaXG1ymO9hreE3Z5DbnvwNcCesXkQYwSSVLFMrLhhxfIpOHjTyXLxxI mbyLyE9UyCXn5rWbtP1w6gV4Dr/yZxIquKKesWdV+WQ/diUWv7642Pf60 KQtx5ihtO3ooLc1Rbm3sBbFfDJnYYKAXyIBOFFOOg62SURuletWr1CDn+ 51vXRZsYTJKa4a64+l2JjCFuRlJ4udGiCrjDKKA0RNyLtZImyV08RNMYf A==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="449322734" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="449322734" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="831912483" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="831912483" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2023 11:52:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6911F1C7; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 06/12] HID: cp2112: Remove dead code Date: Mon, 3 Jul 2023 21:52:16 +0300 Message-Id: <20230703185222.50554-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770426654177687804?= X-GMAIL-MSGID: =?utf-8?q?1770426654177687804?= Remove cp2112_allocate_irq() and counterparts that seems to be a dead code from day 1. In case somebody needs it, it can be retrieved from Git index. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 54 ---------------------------------------- 1 file changed, 54 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 15b626359281..45cd0d2fd3fd 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -17,8 +17,6 @@ */ #include -#include -#include #include #include #include @@ -168,7 +166,6 @@ struct cp2112_device { u8 *in_out_buffer; struct mutex lock; - struct gpio_desc *desc[8]; bool gpio_poll; struct delayed_work gpio_poll_worker; unsigned long irq_mask; @@ -1181,51 +1178,6 @@ static int cp2112_gpio_irq_type(struct irq_data *d, unsigned int type) return 0; } -static int __maybe_unused cp2112_allocate_irq(struct cp2112_device *dev, - int pin) -{ - int ret; - - if (dev->desc[pin]) - return -EINVAL; - - dev->desc[pin] = gpiochip_request_own_desc(&dev->gc, pin, - "HID/I2C:Event", - GPIO_ACTIVE_HIGH, - GPIOD_IN); - if (IS_ERR(dev->desc[pin])) { - dev_err(dev->gc.parent, "Failed to request GPIO\n"); - return PTR_ERR(dev->desc[pin]); - } - - ret = cp2112_gpio_direction_input(&dev->gc, pin); - if (ret < 0) { - dev_err(dev->gc.parent, "Failed to set GPIO to input dir\n"); - goto err_desc; - } - - ret = gpiochip_lock_as_irq(&dev->gc, pin); - if (ret) { - dev_err(dev->gc.parent, "Failed to lock GPIO as interrupt\n"); - goto err_desc; - } - - ret = gpiod_to_irq(dev->desc[pin]); - if (ret < 0) { - dev_err(dev->gc.parent, "Failed to translate GPIO to IRQ\n"); - goto err_lock; - } - - return ret; - -err_lock: - gpiochip_unlock_as_irq(&dev->gc, pin); -err_desc: - gpiochip_free_own_desc(dev->desc[pin]); - dev->desc[pin] = NULL; - return ret; -} - static const struct irq_chip cp2112_gpio_irqchip = { .name = "cp2112-gpio", .irq_startup = cp2112_gpio_irq_startup, @@ -1390,7 +1342,6 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) static void cp2112_remove(struct hid_device *hdev) { struct cp2112_device *dev = hid_get_drvdata(hdev); - int i; sysfs_remove_group(&hdev->dev.kobj, &cp2112_attr_group); i2c_del_adapter(&dev->adap); @@ -1400,11 +1351,6 @@ static void cp2112_remove(struct hid_device *hdev) cancel_delayed_work_sync(&dev->gpio_poll_worker); } - for (i = 0; i < ARRAY_SIZE(dev->desc); i++) { - gpiochip_unlock_as_irq(&dev->gc, i); - gpiochip_free_own_desc(dev->desc[i]); - } - gpiochip_remove(&dev->gc); /* i2c_del_adapter has finished removing all i2c devices from our * adapter. Well behaved devices should no longer call our cp2112_xfer From patchwork Mon Jul 3 18:52:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115474 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp725625vqx; Mon, 3 Jul 2023 11:57:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlEYDskAT5mTDknbHLWkbykIMFZRvtVO1i6ILl0REazVz+MlMxedzLsRW9fch8qhmSqY5S91 X-Received: by 2002:a17:903:1001:b0:1b8:9215:9163 with SMTP id a1-20020a170903100100b001b892159163mr4578411plb.6.1688410628911; Mon, 03 Jul 2023 11:57:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410628; cv=none; d=google.com; s=arc-20160816; b=XfPbMHYvQtWeTpSEKE+VIn4rR0ZOT0im9esdXg2OO+CJlW6qGSJ+dCjCpSvXBt79QG ZYHG1/d684fxLfgOCg/8jll69j5fN3x7DXRphi6kbI0LWUiP6SjQXuZFrwNI/uUgeqcb x6eSCiGKSwCbJOfDBz4Gni0OrWbfQnI5BXaB6CvBCL6V1s4jPRvCCMbaG311k43G6+c8 gYC0HdQpWSoF4Yg5YwLOVRzZ7Jr/bOWh+59CLPHPzyXW8nrMefn10JNCo36MYj43xxZo jRvWR8z+vOBXgkiqBkgKCsURW+9SZ4P+BaeJLUf/qIeTJLdp6tLM6gddXXV8S2DYyBeT 0Wfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OCFxn8CH9MIipJo3NmM7p6Yz/iCLZAzTlw+aSejwsYI=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=LnCu6SQ2GKThgY1S418hXVF4Zj0Gk8Cp+hXWVYiTsCpPt2fGvIG5jAxp9b9uApa+nX mwOPKWKTG7zs+FT0Ft1EahM5vd3GBZ0WjZU0lv8n3u+yLQMd4MxtU8003enZIrNj35tZ Y7DF75cXUSumn8/jgLb6cnZlXtwxqv1ldVIJAO/fC6xxZvegPVXBAogUT+UOTctEDQTp wzteGssmx9efr3n+tDwlm2DGko8BqgxJuWNyeuOg6jvDOCe+/GS4ynY1PKPs5rUYXU87 ptvxOjIpP3MowY4HHaZ1VAKUWuNAJKsvLk/Kt0XNFDO5I+fQ7zBASTNndJj1uWJp1HtN yK3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LZJRBeTg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m6-20020a170902db0600b001b8867a7ce2si5457161plx.273.2023.07.03.11.56.54; Mon, 03 Jul 2023 11:57:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LZJRBeTg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231479AbjGCSwr (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231319AbjGCSwd (ORCPT ); Mon, 3 Jul 2023 14:52:33 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81C11E71; Mon, 3 Jul 2023 11:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410352; x=1719946352; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6yEDgvxJlryYWI7k71QyO6QRP75T9Vue+ghIMACgdzE=; b=LZJRBeTgQ0RkPPIRnxdS/0G7zd2amHq7GfSWGahuitTFSRdLJat6C6T2 1piknSPBttTqIhs1tncusrYQF9ntGQmMlQtZla99XDvjxWEmOdyrq71FM cphn99f9NvOiZSx0GJ8xkGJ/97gFxNN9eqzfJaFce1ruSJCJxFqI5JkC6 tLlIT1/px54QS7llzstL+iqt5j6abcNrWHhxpY5ai4HOq6nIV+m9vxpUm 6xgb1mSrPyt9+eOlPT8e5cdpS/m5l7wnZDmgTOOP+aitUL+8bGn6LaNiv 4rj6AFR+f+7ZU6HEIe/98SkTgV+iubZm/WoZ8/upa3WigZnqoNitULpKq g==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="449322737" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="449322737" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="831912486" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="831912486" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2023 11:52:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7902C5FC; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 07/12] HID: cp2112: Define maximum GPIO constant and use it Date: Mon, 3 Jul 2023 21:52:17 +0300 Message-Id: <20230703185222.50554-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770426863662003825?= X-GMAIL-MSGID: =?utf-8?q?1770426863662003825?= Define maximum GPIO constant and use it in the driver. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 45cd0d2fd3fd..c8c59d70500e 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -31,6 +31,7 @@ #define CP2112_GPIO_CONFIG_LENGTH 5 #define CP2112_GPIO_GET_LENGTH 2 #define CP2112_GPIO_SET_LENGTH 3 +#define CP2112_GPIO_MAX_GPIO 8 enum { CP2112_GPIO_CONFIG = 0x02, @@ -1108,7 +1109,7 @@ static void cp2112_gpio_poll_callback(struct work_struct *work) goto exit; gpio_mask = ret; - for_each_set_bit(virq, &dev->irq_mask, 8) { + for_each_set_bit(virq, &dev->irq_mask, CP2112_GPIO_MAX_GPIO) { irq = irq_find_mapping(dev->gc.irq.domain, virq); if (!irq) continue; @@ -1295,7 +1296,7 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) dev->gc.set = cp2112_gpio_set; dev->gc.get = cp2112_gpio_get; dev->gc.base = -1; - dev->gc.ngpio = 8; + dev->gc.ngpio = CP2112_GPIO_MAX_GPIO; dev->gc.can_sleep = 1; dev->gc.parent = &hdev->dev; From patchwork Mon Jul 3 18:52:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp725928vqx; Mon, 3 Jul 2023 11:57:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlEDJ7V2zcV4ec6KYnJNgRcnKond9K7vsjJIz3K5OwhBhRsB6cUSoctU1JEvC4LSLa6UbrfH X-Received: by 2002:a17:902:c246:b0:1b8:5827:8763 with SMTP id 6-20020a170902c24600b001b858278763mr11378299plg.4.1688410666203; Mon, 03 Jul 2023 11:57:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410666; cv=none; d=google.com; s=arc-20160816; b=Z2AtuJxx6YPGwP9sO00nxBRVlrbZnNMX+PGQF9prhuDNygYG0Dp6qwGA0ikSHF4bIn ZSAA772+XvDOpa4TgD9s+/0N/kfHR6yhFsMTwfq4qTWKQbnrOHZgmVLke8iE06oe3G6T 2k7VYR5oZKAm30boWlT/nmKPTC+8VvcnCoxm/HZ0+vYAewxXCfnTbCHTKWiU+S3iqWxK 5Go575PK8m9tZeIgLtiNIGvFq/h/Jo24Ne2BNugsj+v+rqSrTXYm+pkYs28cf2gaPmww RxyMdDzqw0Gohmz7AqoQIluuquoYJRR1hnrq08r5As3jxTV1yJrXdopmf0eNdS64yM9/ wekg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=naso+Dlydy/21lYdnWaMYeMGa3F098qOW2zLGaQ+T6s=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=sKILfnzlDYPQ+Kj1pgP0kVGvLLaoZwe9oyv/dKVm5dE7+gU2OXBbgoU0ryncvl9OPD eQk7aE5oThiPbL5sC7S6bUpn0TdQ/RjA5+ej01xw4+FVYz3YL9WfYRjcM1KGzRxkG0kY +Ku5NIk/ElwCuB29tNFokZtsruFOihKdsfothfj8V70bsuyBPZ1p/S9N067PtUUBcYpz eXQTDa9DEe2BkCWKQSZdD2Q2OXfz7x6GBdTunHCk5ovnN/VRcTDrMKFvLwuJf2ueZnYl Gi6Ha5/8XyVVNmIbywqVziKk5XCeBKXwM2XBHZ7vL7ZA1Ibw35jf5ARhaKdMKRZSaWCK CpdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dtjfJBOB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x16-20020a170902ec9000b001b7dcf3cf30si6626015plg.80.2023.07.03.11.57.31; Mon, 03 Jul 2023 11:57:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dtjfJBOB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231522AbjGCSwx (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231341AbjGCSwf (ORCPT ); Mon, 3 Jul 2023 14:52:35 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAA2FE7C; Mon, 3 Jul 2023 11:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410353; x=1719946353; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LCgdVKzpcSaOUGJnyo5Kogm8rdwSx8t88vdpkdS1kM4=; b=dtjfJBOBx6zqL1e/DIRNxWjFlJpFgl/Gi4Hsfi0WysZWokYHGqTZuo2o 4zohCAAYJbPzldziHBB8VUVece5TMCaOHSBSvFuRfVPbrfcEdDP5g6+14 wv1WbdyK8ltBJIKAUW93d+HFJWgcLiLqp9fKAeTRNeYoHz6xCeMUgyTSj qikZ4+0jLOcKzuoVGBL3xZiBpgZeG+qsp9yg3oIS3RCe86AQuMzAflVx4 AvuUUZxqsaUH+yxnbYu+dkOUQnEidyjmgQYfG8kcgCQ+g2X4GYnhA//AQ EwOCJx+9nHp2zBp1XVz21zwlH0HzCOSFphrqoaTiX7YT9Vj6PLXI8mRhe w==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="449322731" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="449322731" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="831912485" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="831912485" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2023 11:52:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8007D22B; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 08/12] HID: cp2112: Define all GPIO mask and use it Date: Mon, 3 Jul 2023 21:52:18 +0300 Message-Id: <20230703185222.50554-9-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770426902684055540?= X-GMAIL-MSGID: =?utf-8?q?1770426902684055540?= Define all GPIO mask and use it in the driver. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index c8c59d70500e..37ed7fc54770 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -32,6 +32,7 @@ #define CP2112_GPIO_GET_LENGTH 2 #define CP2112_GPIO_SET_LENGTH 3 #define CP2112_GPIO_MAX_GPIO 8 +#define CP2112_GPIO_ALL_GPIO_MASK GENMASK(7, 0) enum { CP2112_GPIO_CONFIG = 0x02, @@ -173,7 +174,7 @@ struct cp2112_device { u8 gpio_prev_state; }; -static int gpio_push_pull = 0xFF; +static int gpio_push_pull = CP2112_GPIO_ALL_GPIO_MASK; module_param(gpio_push_pull, int, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(gpio_push_pull, "GPIO push-pull configuration bitmask"); @@ -226,7 +227,7 @@ static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value) mutex_lock(&dev->lock); buf[0] = CP2112_GPIO_SET; - buf[1] = value ? 0xff : 0; + buf[1] = value ? CP2112_GPIO_ALL_GPIO_MASK : 0; buf[2] = 1 << offset; ret = hid_hw_raw_request(hdev, CP2112_GPIO_SET, buf, From patchwork Mon Jul 3 18:52:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp724196vqx; Mon, 3 Jul 2023 11:54:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlGL76tK1MyG9qw/tjxNOI4RU96xPazfggN3EhY2ydLd3+tdyz40UgY5un8CQuf1su7DzSub X-Received: by 2002:a17:903:1001:b0:1b8:9215:9163 with SMTP id a1-20020a170903100100b001b892159163mr4572216plb.6.1688410446065; Mon, 03 Jul 2023 11:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410446; cv=none; d=google.com; s=arc-20160816; b=aWHhOmZdh7QIchNnGllUBWf59O0hBgbSQjyHrDNMpJpSF3iR/JdGCqMksRGApkpwk8 TQOI/1/i0OxvZMjcStN2grYjl2XDxlHI2GjnL1PTGL1H1WAgyvZz0CVTbd//LjH7Sd+2 duJjD+SuLQ12FEGOjNkKw4ynph0Tzulw/LgUEwM6s92zyPVOLUthnpxtsV32cfEg0Ktd /7f0b9sUCpRl2z9aNA5H7EpkE++IvWftw4TuQWZe3cw1kAbbII1wKW3PJUXlbQsVsd3Z BajDlFhlGfGH0XcnEk5nC26wZBR79UUqUPv2p3IrJBNW05EzJRpQZQYFMrO2OlnBK0lW eIGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cOmNS+26YjQ/oQ7HfmK6bmxntLgf7Aj2W9eJuDSdOf8=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=banKmTtvshvwmnYls1o78znuNMryC8eU5XqLYZiI0D8tAkcrIZobfTwZKXOR+wLTPd N0C8D6jxJG80mZPxDr2v8RhHFVmUqwXt432mb58eT4ZvVvpPMJThrf8Zaof3SJImjNdh DvM7Irci9i482pEZa+IRbgkLuGUoSnFicqeUPrnMOENWFYHkpQt88z6i08aUTdO+gE7G VdrQuC1q4KhljBl7dQjr8isEsq/MbO16Qkki+4CNde+4GG4Wk0EB5Dd9B0j5FnvXtiHq RPEe+if3T7JDJ2SF20tYkb4QrwsBw5+2D+u1igkimZ976fUm9HokGSigsCuRby834MO4 lyvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=T4rsQjEy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z9-20020a170903018900b001b8918da8cdsi3707770plg.205.2023.07.03.11.53.50; Mon, 03 Jul 2023 11:54:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=T4rsQjEy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231488AbjGCSwu (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231331AbjGCSwf (ORCPT ); Mon, 3 Jul 2023 14:52:35 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D962FE73; Mon, 3 Jul 2023 11:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410352; x=1719946352; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=v4C8UxsVUCeBkxMXFBixS/NWejTXhA8uVL1LjjkP2gU=; b=T4rsQjEyrI1fkl9P/+HgQU5+dpKBBEVcpZUVY1QEReSSDHiu6NEq2R4w i46jl0CPhAjLHIhnibDZgq+mCz9YI6cvoLdivPXUhTZ1vdkYAV1IHR3wG Rb6STXV9m+lxFnIvW9I0SXtw2vFkwv+U+FQS5QoAtLhsYgRuwA8gkiO6x +rOBBuR9tWbWO2qyaPHMrnXK/V/kc/ZgMyQnhVQX45Ie5lMOpCPUrH2Q2 x25NXANe3ytRw74+bjexel2/FPUfmvl+gVyK/JCO/T1V/SSl7m6qng/TS BxXdbF0O4Bch7kRncsZMExUFCtTWWZM2KMCD/bJuCGvtfXxUGp8q/OiMl g==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="449322727" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="449322727" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="831912484" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="831912484" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2023 11:52:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8B0B5604; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 09/12] HID: cp2112: Use BIT() in GPIO setter and getter Date: Mon, 3 Jul 2023 21:52:19 +0300 Message-Id: <20230703185222.50554-10-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770426671890438971?= X-GMAIL-MSGID: =?utf-8?q?1770426671890438971?= Use BIT() in GPIO setter and getter for the sake of consistency with GENMASK() usage elsewhere in the driver. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 37ed7fc54770..2eebb2b19501 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -197,7 +197,7 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) goto exit; } - buf[1] &= ~(1 << offset); + buf[1] &= ~BIT(offset); buf[2] = gpio_push_pull; ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, @@ -228,7 +228,7 @@ static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value) buf[0] = CP2112_GPIO_SET; buf[1] = value ? CP2112_GPIO_ALL_GPIO_MASK : 0; - buf[2] = 1 << offset; + buf[2] = BIT(offset); ret = hid_hw_raw_request(hdev, CP2112_GPIO_SET, buf, CP2112_GPIO_SET_LENGTH, HID_FEATURE_REPORT, From patchwork Mon Jul 3 18:52:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115480 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp729712vqx; Mon, 3 Jul 2023 12:03:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlGTzTN7PVqHq/m21xFek8sq6JScm45NBSc4DqVN6Xav9/MtfdKl8HZ5LYe9X6WLkEB6bJCh X-Received: by 2002:a05:6e02:924:b0:345:8a74:761b with SMTP id o4-20020a056e02092400b003458a74761bmr9800137ilt.1.1688411022581; Mon, 03 Jul 2023 12:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688411022; cv=none; d=google.com; s=arc-20160816; b=gHZMCFFIOo3RlXJ1sIY4tvUMfqQul3O5x1qfvF3r+LgDP3npxSq//0mnNkJ03PwQgB nqWmUq+ltptEMHyB9X/7YRL0qDFX+WHoT9D3V2Q7yJLNduWSh5c7C1U6gpr9AwVRrzHl D+58JskpXdp5I8zgGgNC81mw9iIpHo3bfPWzvTdPT6i3SX6EjK8tT9EU/ECjY6mm16ux Hkis/xbatx+2lHPelskPVx4gexP0Iv+VJfh6AbxkmxJ50zhKZOu2XXiZqgMC1CqtewYs PTgybszY8bBazXLuFpyMsKoKDHuswQI/pfz3SP7nvorcEP+Xxx7uyUKBp8jtSCdhoeuR izog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vK/50/ZHbjda/uGTWkKA5xxrpyZD3W3K0Lg7GQWjyvc=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=Rf7//IuJI306GBB8GBy5ik+FqBwlt15wj+qLgSCaPHvQnFBdz0Qy/Yf3gIzMhVS829 J2Qk8TuX0VgG2MCZ9DFGgicgTkW1FNshfBU1Iz7L1e9CVhIGAj33T2jXhhAmaPxCrfZb c/ySbT/Vdib75kK+aPjE5kk5aaHJsRt6qkP5M4a4GHVX6cTCLig9Jp/ZRcID2Iq7rPnY +7qq+HdjVQe3oDD7TVZhTVTcKAHEZ9CZKNA/h2OxgF2uEU+wiXMKX8P+rP2whMavL8iy nEM7Zs4/+jy4ETCvjdurrOnXnzvAmedCUVpb6JHoU7EfEo0aHmQ+25Vy/4ZKww0vw+cp FO6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IHKIiGLe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hi3-20020a17090b30c300b002636d222400si8525449pjb.14.2023.07.03.12.03.28; Mon, 03 Jul 2023 12:03:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IHKIiGLe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231344AbjGCSwm (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231230AbjGCSw3 (ORCPT ); Mon, 3 Jul 2023 14:52:29 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 297F5E64; Mon, 3 Jul 2023 11:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410349; x=1719946349; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AOpwNXsh/T5AKgW2rwkqtZXdctnpIN5g1+lx5hcu/eQ=; b=IHKIiGLepKLudKGOFXzXDpHnMJqntvszdLp6yyQo+wx3Or0X3HgsJnic YuaazsoTyPeZNxNW7eL5s5ZESQsPun8eU+xOLVEpbGrEFgQ+znqCEaIib tSNNTurhwZMNirBnsDd4AOGIjphfWLL0VxCa89/CBXpODSuuj5YH2Pekf YYwV6cCFGuHHamTVVv7eHz8fzgXwSemxnwGgtHDeoc1lISxMohXumHsXx bRCXg/TjGYXrGe89lv4bvBumeHr8lCSayWLSbSnMnKDvfsChHCMvdvrFg iGbEyRR5614v0rogVzNJ2yqAAn0Jzv31alNRbYYnNMasFtRG17fQzEew4 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="362986970" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="362986970" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="721860814" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="721860814" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 03 Jul 2023 11:52:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9C8D369F; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 10/12] HID: cp2112: Use sysfs_emit() to instead of scnprintf() Date: Mon, 3 Jul 2023 21:52:20 +0300 Message-Id: <20230703185222.50554-11-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770427276376721418?= X-GMAIL-MSGID: =?utf-8?q?1770427276376721418?= Follow the advice of the Documentation/filesystems/sysfs.rst and show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 2eebb2b19501..1e45f5407d09 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -893,7 +893,7 @@ static ssize_t name##_show(struct device *kdev, \ int ret = cp2112_get_usb_config(hdev, &cfg); \ if (ret) \ return ret; \ - return scnprintf(buf, PAGE_SIZE, format, ##__VA_ARGS__); \ + return sysfs_emit(buf, format, ##__VA_ARGS__); \ } \ static DEVICE_ATTR_RW(name); From patchwork Mon Jul 3 18:52:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp725514vqx; Mon, 3 Jul 2023 11:56:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlE3icjDpFaTF/BJ4rNdL8TrpSzwuENWHg6Gjs2VzdCGjq/iHBrQoRNsqWn3ZYg4i4/g6Aw8 X-Received: by 2002:a17:902:ec88:b0:1b8:811:b079 with SMTP id x8-20020a170902ec8800b001b80811b079mr11030391plg.0.1688410612651; Mon, 03 Jul 2023 11:56:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688410612; cv=none; d=google.com; s=arc-20160816; b=Fi3cpMGn9p7pbvoCqTxxNRxbHGuMVIJfKthSZZpSd+787lBnXpCfOfmSK0CcQYqUIk kW0nGeLs1X0+l08upGM2Jku+B4MEanW2bOjCexshTFNzz8wZuilnDaMpv0FdqWLDht9t pdMVQhCONIc5UPPFvIhKf24xw580edxiV2iVTXVC8xxxRb3wLyTUMps4xN4B5lGzmnNX Z6aMz5zrJKhXdwJrpsSgTyYFLIFacO6+ToHAGVh9b65WnKanoK8tddY5Hga5Lc06kK5z jIuj0AfrUbzA9leTY01n6HVFwsc4qD56MJrixxKxUCYlHBmVRqN7KshP0ML3wH+b0llQ T4QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fxTO5xH6QEkUDVLzpjDkQCD7OEMcWeWP+I8hCMBouuA=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=heHQ6Olk6StVLPrzDuCo6PTFMMj2hU14EYms8g/sKZhn0MiQtWHHUKSPThWQc/WUiX U35NaN308o7kqDMHsLSvU/q7D/juaPfaLRP80X9aMtLS12HCNfDj0jMQJXHNaGqNy1HZ /GTijQlNeXkOndqWF6w7Ztu57jr+MMqC1v7XS1ZaIBKhBENTBT/MUz1z/iod45RX/JkW 2R5FeIyLdN58ZUvCMZ7cCQbCDVkgDWW2JI51JBUDdTZ87X/+0Ucb2JcDIVdgJa4XJiN8 O8Cl1k0WTiCbfvyZeYe3KqXjZ4vjucMYDEsztLeL0uJ4J/j3R/je6PC6Ye61v3ir//Te 0UAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=C48jagK3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s3-20020a170902ea0300b001b876d46162si7642872plg.38.2023.07.03.11.56.37; Mon, 03 Jul 2023 11:56:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=C48jagK3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231417AbjGCSww (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231348AbjGCSwf (ORCPT ); Mon, 3 Jul 2023 14:52:35 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57407E7B; Mon, 3 Jul 2023 11:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410353; x=1719946353; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lYPz1zqR2x3WBQCDulQo4Jbi7YfCgb1sAO+AUE8NaYA=; b=C48jagK3r8s+dfHvMr47nC+VdKWjvtdvWECCkl7yh4E/XJYG+31WGmq2 OWCpgcNwoK119LRc8oYQ40IRKCd9PK0VeszTN6f5Fs9YeUk/ALwirSI2Q o4I6ZQHDPi1Y4dqoN6pZhJkaLlWn7Nh3JrBMwGQRMvnNIyP2izpelCc8v R51KKRGqVhrnRek4vn6L9g52Wr2kv4ckZ4fP4OYkc0+uVIHwtR68yPAum MOoeNllmcqiPKBSbrF8Csnv+5+lTDsnQdjtplxaGsUlgebXosJrLK1cW2 c6IgrgZrbHw5larhIR8WOGjFdI7nyIDJDY8uq1zdzRaGe+gk1ZNsYNKPr g==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="449322743" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="449322743" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="831912489" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="831912489" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2023 11:52:27 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id A2FA869A; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 11/12] HID: cp2112: Convert to DEVICE_ATTR_RW() Date: Mon, 3 Jul 2023 21:52:21 +0300 Message-Id: <20230703185222.50554-12-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770426846641546911?= X-GMAIL-MSGID: =?utf-8?q?1770426846641546911?= Instead of custom wrapper, use DEVICE_tATTR_RW() directly. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 42 ++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 1e45f5407d09..3c6a3be8fc02 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -944,18 +944,10 @@ CP2112_CONFIG_ATTR(release_version, ({ #undef CP2112_CONFIG_ATTR -struct cp2112_pstring_attribute { - struct device_attribute attr; - unsigned char report; -}; - -static ssize_t pstr_store(struct device *kdev, - struct device_attribute *kattr, const char *buf, - size_t count) +static ssize_t pstr_store(struct device *kdev, struct device_attribute *kattr, + const char *buf, size_t count, int number) { struct hid_device *hdev = to_hid_device(kdev); - struct cp2112_pstring_attribute *attr = - container_of(kattr, struct cp2112_pstring_attribute, attr); struct cp2112_string_report report; int ret; @@ -963,7 +955,7 @@ static ssize_t pstr_store(struct device *kdev, ret = utf8s_to_utf16s(buf, count, UTF16_LITTLE_ENDIAN, report.string, ARRAY_SIZE(report.string)); - report.report = attr->report; + report.report = number; report.length = ret * sizeof(report.string[0]) + 2; report.type = USB_DT_STRING; @@ -981,17 +973,15 @@ static ssize_t pstr_store(struct device *kdev, return count; } -static ssize_t pstr_show(struct device *kdev, - struct device_attribute *kattr, char *buf) +static ssize_t pstr_show(struct device *kdev, struct device_attribute *kattr, + char *buf, int number) { struct hid_device *hdev = to_hid_device(kdev); - struct cp2112_pstring_attribute *attr = - container_of(kattr, struct cp2112_pstring_attribute, attr); struct cp2112_string_report report; u8 length; int ret; - ret = cp2112_hid_get(hdev, attr->report, (u8 *)&report.contents, + ret = cp2112_hid_get(hdev, number, (u8 *)&report.contents, sizeof(report.contents), HID_FEATURE_REPORT); if (ret < 3) { hid_err(hdev, "error reading %s string: %d\n", kattr->attr.name, @@ -1016,10 +1006,16 @@ static ssize_t pstr_show(struct device *kdev, } #define CP2112_PSTR_ATTR(name, _report) \ -static struct cp2112_pstring_attribute dev_attr_##name = { \ - .attr = __ATTR(name, (S_IWUSR | S_IRUGO), pstr_show, pstr_store), \ - .report = _report, \ -}; +static ssize_t name##_store(struct device *kdev, struct device_attribute *kattr, \ + const char *buf, size_t count) \ +{ \ + return pstr_store(kdev, kattr, buf, count, _report); \ +} \ +static ssize_t name##_show(struct device *kdev, struct device_attribute *kattr, char *buf) \ +{ \ + return pstr_show(kdev, kattr, buf, _report); \ +} \ +static DEVICE_ATTR_RW(name); CP2112_PSTR_ATTR(manufacturer, CP2112_MANUFACTURER_STRING); CP2112_PSTR_ATTR(product, CP2112_PRODUCT_STRING); @@ -1034,9 +1030,9 @@ static const struct attribute_group cp2112_attr_group = { &dev_attr_max_power.attr, &dev_attr_power_mode.attr, &dev_attr_release_version.attr, - &dev_attr_manufacturer.attr.attr, - &dev_attr_product.attr.attr, - &dev_attr_serial.attr.attr, + &dev_attr_manufacturer.attr, + &dev_attr_product.attr, + &dev_attr_serial.attr, NULL } }; From patchwork Mon Jul 3 18:52:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115481 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp737480vqx; Mon, 3 Jul 2023 12:16:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlE+E4yyog7Ok6hR06r9Q+qzCjPz9FTjhKiW7uRn0YF5mY6le54l524smnHEFKIA6Ydup+1H X-Received: by 2002:a17:902:fb8e:b0:1b8:70d2:eb3a with SMTP id lg14-20020a170902fb8e00b001b870d2eb3amr10660491plb.0.1688411818658; Mon, 03 Jul 2023 12:16:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688411818; cv=none; d=google.com; s=arc-20160816; b=tdGUvnNs0XdyYgn4Udv8xYjcOK+MyX1QnebxV80E+lv+YpoByNiq5i0oQ9pCc6atQv 6fNK7k43PlwjkZXdZIaT2dA/lGRXliLjNcC/rVbumcvqv2VHZgHIPgC4vN6ivA8hqX7A fQ7vEEbQ/RPxR5vhuinZp/xEwmD3JnlW3aFNWIp6KDwt3ObWEtYXcxnsRrEveieVsefw pfJLzlynv/77LSInInMHQLjzvIaU7PLXE5RzxPsCTxWcYPFlIz7YL+rFEI/7vBrX78p1 BH7FccVtqizdSDxtA+xfal/71CjXdqcUEXl31vBe6bSncvIolw9SLXwMKGgf3qt19k0m +x9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rftZDMHsKVFgJCAFs9Ug/CYV60+efPORzXv5aNT32sw=; fh=5yeSY1SX/5BYKJ3zhDzboq66lb94ksAw0qpQI5n3Am0=; b=TDCU6qEQA1qGbtxYM+S+LdGUTyBbb2scxWUxuHwNm9vTSzItv8VjqXTkKsjaf7VoaP QsR6aSeSFzUo+owkiESuZGxMhHmeTNFs4OTNkgRV82n3SU27kssTovb7v6DmFiV4FyQh sIHU2PkEVTKzbH0hdgigqQooRIJCJgkawq/zpOcDhjcgS1496ASfBknkS9vSPq2UNjra 9FBtYGOBCmGluMmwi8n8jTwheAGxL862S0zApi0YR7uvRgZ+27xw7Kmlyg0yshzcJ1yE TiRx8QVBbURjlacuFkfsO2zeVCDAwIyzwaIy4nxnzJF3+ymLKTGNI4zsFAiu5hbtLQTM ZyXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RlT90CFG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c21-20020a170902849500b001b3d822f131si17752390plo.239.2023.07.03.12.16.42; Mon, 03 Jul 2023 12:16:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RlT90CFG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231531AbjGCSw4 (ORCPT + 99 others); Mon, 3 Jul 2023 14:52:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231349AbjGCSwf (ORCPT ); Mon, 3 Jul 2023 14:52:35 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F18C2E7D; Mon, 3 Jul 2023 11:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688410353; x=1719946353; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mym6i/tgEoTAGg7H2qslE07ns2in3+2GRLlg1GCRN9A=; b=RlT90CFGm+HhAHm8GG5kZuGftH0fuX7HV5Vcv9faqtw2ufVBQhSKcJfZ x1QJdUCLGXhhX0TbCmGtuhnh5tJ0tZ+Px3Ea2CvT31mcDP25mXDjxZZFU UI4/nyIxgLMf19iUQfpZ1bZNRyo+AqwUVPeE0+YwpofxLf5S9EHB1HzWH IB+i9w5YCKpssXKqq9jkkJFlqtguZgsqMCrHcjl+8Il5cvGGd3NG9GNI6 3ziJ4se32uzzZZJ04jQQmtfow1TTSOYo5LJxNmSeoC3c5lxEh38q1iTR8 OKDa2DDrytnrBQw0uhzSG1EwZY45s+Wn30pa/Cx+lIWOzHIUUsmx/eUEf g==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="449322739" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="449322739" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 11:52:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="831912490" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="831912490" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2023 11:52:27 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id BF7C2718; Mon, 3 Jul 2023 21:52:27 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jiri Kosina , Benjamin Tissoires , Andy Shevchenko Subject: [PATCH v1 12/12] HID: cp2112: Use octal permissions Date: Mon, 3 Jul 2023 21:52:22 +0300 Message-Id: <20230703185222.50554-13-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> References: <20230703185222.50554-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770428111198026326?= X-GMAIL-MSGID: =?utf-8?q?1770428111198026326?= Octal permissions are preferred as stated in Documentation/dev-tools/checkpatch.rst. Replace symbolic permissions with octal permissions when creating the files. Signed-off-by: Andy Shevchenko --- drivers/hid/hid-cp2112.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 3c6a3be8fc02..adbe8a47cf67 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -175,7 +175,7 @@ struct cp2112_device { }; static int gpio_push_pull = CP2112_GPIO_ALL_GPIO_MASK; -module_param(gpio_push_pull, int, S_IRUGO | S_IWUSR); +module_param(gpio_push_pull, int, 0644); MODULE_PARM_DESC(gpio_push_pull, "GPIO push-pull configuration bitmask"); static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) @@ -1057,7 +1057,7 @@ static void chmod_sysfs_attrs(struct hid_device *hdev) } for (attr = cp2112_attr_group.attrs; *attr; ++attr) { - umode_t mode = (buf[1] & 1) ? S_IWUSR | S_IRUGO : S_IRUGO; + umode_t mode = (buf[1] & 1) ? 0644: 0444; ret = sysfs_chmod_file(&hdev->dev.kobj, *attr, mode); if (ret < 0) hid_err(hdev, "error chmoding sysfs file %s\n",