From nobody Wed Feb 11 10:39:54 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97F45C7618A for ; Mon, 20 Mar 2023 14:52:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232003AbjCTOwi (ORCPT ); Mon, 20 Mar 2023 10:52:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232053AbjCTOwF (ORCPT ); Mon, 20 Mar 2023 10:52:05 -0400 Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5666928D0E for ; Mon, 20 Mar 2023 07:50:32 -0700 (PDT) Received: by mail-qt1-x82c.google.com with SMTP id d7so13273776qtr.12 for ; Mon, 20 Mar 2023 07:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679323827; 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=pn9VGQBxO0VW8CThpup8iOfOpiJuYyrE48H21arWabA=; b=PPOV3xzK+7nwJdGa5mz7vqiQRiXzw677QBbck0mYP/jr+bKo3tFkmHx/pPMW1Tyl18 IpKhhBXpD7UAFS3OafL5z/0LZQasbe/tivkm9pTXL5KPewQ1tdimFO0u+PY7c+DnfDsf C60nJQLuTSpqcWigH9ZrHKL21rIC+kszpNiaPBPwYOoDJWRXIRRtOPvdTCbulHcMcoIb sXiIeg4z2ibqGZN2F0ju4p5GtmvU1adwcjalaQDNpe+PQbDgXxQaEH4NlKDGB02MZM50 3bUhgWzE4pJN5VsP9bf5GmErm+GoU9Ac67hn6/J9iOHZv7E/rgPdz79mwRLYXBs4kZJ8 HvzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679323827; 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=pn9VGQBxO0VW8CThpup8iOfOpiJuYyrE48H21arWabA=; b=S9m0fROgrJ+oXPewfee9xiXLHCaL0OQIHNW8uELOgYgLYneyKvnC4i86mfKWGL+f2r YoevhvOm40nXzeX6HM/Y6qYrYMU887ZbFGAWHn8Y3X3He2sCgtZH23maUd1v+27Qr6rk 0lsPI5QV0N/0tvjICS5GCePFWDQwdolm/lOQNz3enD4/r9MZkXL8Ws0uf3EyVRbG4S+Z 710q7/6VqqNlcqs+bqIgBzkYFj8/MvFBbfdRCYE8xvZJcif6JMThKU+UBSElliwX5YCc e+o7Z/DaiPkFZFsyc3OYghjVFxHOKg3r65PtBX97i2VQujtWIL2fMrDZFZP/Zwkivn6y 5SEQ== X-Gm-Message-State: AO0yUKX0Lho094MDi1oC2SkUa1NFgr8SvayXjzi3DqyGklU+IqB9oU83 WcXNNVPXOgKpxCGTvgXuutjdhQ== X-Google-Smtp-Source: AK7set9+0mXLe9k4QN0nTZcqYPZiCiU0cUy0Xx1hGyeToTdtbFtDMgwcB2Tonh4UaemzWE1WSbXZRg== X-Received: by 2002:a05:622a:15d0:b0:3b4:7efb:36a7 with SMTP id d16-20020a05622a15d000b003b47efb36a7mr19636317qty.27.1679323826323; Mon, 20 Mar 2023 07:50:26 -0700 (PDT) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id o14-20020ac872ce000000b003e03178112dsm2661003qtp.13.2023.03.20.07.50.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 07:50:26 -0700 (PDT) From: William Breathitt Gray To: Mark Brown , Linus Walleij , Bartosz Golaszewski Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Andy Shevchenko , William Breathitt Gray Subject: [PATCH v3 1/2] gpio: 104-dio-48e: Implement struct dio48e_gpio Date: Mon, 20 Mar 2023 10:50:15 -0400 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" A private data structure struct dio48e_gpio is introduced to facilitate passage of the regmap and IRQ mask state for the device to the callback dio48e_handle_mask_sync(). This is in preparation for the removal of the handle_mask_sync() map parameter in a subsequent patch. Signed-off-by: William Breathitt Gray Reviewed-by: Andy Shevchenko Reviewed-by: Linus Walleij --- Changes in v3: - Inline dio48gpio->map usage in dio48e_handle_mask_sync() to avoid redefining map parameter drivers/gpio/gpio-104-dio-48e.c | 35 ++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48= e.c index 74e2721f2613..3516321c92b0 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -99,13 +99,23 @@ static const struct regmap_irq dio48e_regmap_irqs[] =3D= { DIO48E_REGMAP_IRQ(0), DIO48E_REGMAP_IRQ(1), }; =20 +/** + * struct dio48e_gpio - GPIO device private data structure + * @map: Regmap for the device + * @irq_mask: Current IRQ mask state on the device + */ +struct dio48e_gpio { + struct regmap *map; + unsigned int irq_mask; +}; + static int dio48e_handle_mask_sync(struct regmap *const map, const int ind= ex, const unsigned int mask_buf_def, const unsigned int mask_buf, void *const irq_drv_data) { - unsigned int *const irq_mask =3D irq_drv_data; - const unsigned int prev_mask =3D *irq_mask; + struct dio48e_gpio *const dio48egpio =3D irq_drv_data; + const unsigned int prev_mask =3D dio48egpio->irq_mask; int err; unsigned int val; =20 @@ -114,19 +124,19 @@ static int dio48e_handle_mask_sync(struct regmap *con= st map, const int index, return 0; =20 /* remember the current mask for the next mask sync */ - *irq_mask =3D mask_buf; + dio48egpio->irq_mask =3D mask_buf; =20 /* if all previously masked, enable interrupts when unmasking */ if (prev_mask =3D=3D mask_buf_def) { - err =3D regmap_write(map, DIO48E_CLEAR_INTERRUPT, 0x00); + err =3D regmap_write(dio48egpio->map, DIO48E_CLEAR_INTERRUPT, 0x00); if (err) return err; - return regmap_write(map, DIO48E_ENABLE_INTERRUPT, 0x00); + return regmap_write(dio48egpio->map, DIO48E_ENABLE_INTERRUPT, 0x00); } =20 /* if all are currently masked, disable interrupts */ if (mask_buf =3D=3D mask_buf_def) - return regmap_read(map, DIO48E_DISABLE_INTERRUPT, &val); + return regmap_read(dio48egpio->map, DIO48E_DISABLE_INTERRUPT, &val); =20 return 0; } @@ -167,7 +177,7 @@ static int dio48e_probe(struct device *dev, unsigned in= t id) struct regmap *map; int err; struct regmap_irq_chip *chip; - unsigned int irq_mask; + struct dio48e_gpio *dio48egpio; struct regmap_irq_chip_data *chip_data; =20 if (!devm_request_region(dev, base[id], DIO48E_EXTENT, name)) { @@ -185,12 +195,14 @@ static int dio48e_probe(struct device *dev, unsigned = int id) return dev_err_probe(dev, PTR_ERR(map), "Unable to initialize register map\n"); =20 - chip =3D devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); - if (!chip) + dio48egpio =3D devm_kzalloc(dev, sizeof(*dio48egpio), GFP_KERNEL); + if (!dio48egpio) return -ENOMEM; =20 - chip->irq_drv_data =3D devm_kzalloc(dev, sizeof(irq_mask), GFP_KERNEL); - if (!chip->irq_drv_data) + dio48egpio->map =3D map; + + chip =3D devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); + if (!chip) return -ENOMEM; =20 chip->name =3D name; @@ -205,6 +217,7 @@ static int dio48e_probe(struct device *dev, unsigned in= t id) chip->irqs =3D dio48e_regmap_irqs; chip->num_irqs =3D ARRAY_SIZE(dio48e_regmap_irqs); chip->handle_mask_sync =3D dio48e_handle_mask_sync; + chip->irq_drv_data =3D dio48egpio; =20 /* Initialize to prevent spurious interrupts before we're ready */ err =3D dio48e_irq_init_hw(map); --=20 2.39.2 From nobody Wed Feb 11 10:39:54 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6603C7618A for ; Mon, 20 Mar 2023 14:52:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232079AbjCTOwm (ORCPT ); Mon, 20 Mar 2023 10:52:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231979AbjCTOwP (ORCPT ); Mon, 20 Mar 2023 10:52:15 -0400 Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7D3728E84 for ; Mon, 20 Mar 2023 07:50:33 -0700 (PDT) Received: by mail-qt1-x829.google.com with SMTP id c10so2094474qtj.10 for ; Mon, 20 Mar 2023 07:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679323828; 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=2ubabgTfuQRUHcQ6nKf64nxm8BOFtXJ8YmpeRNoMRoE=; b=VgzMDQtzc2uS93M5NqYUM9GW1/DSCkXn5WixLv5WihMtmetUYprltbDnXBQm4g76vJ JJw6O8YxEABBK0ksy6TriZYj+5onqsoNZYlcXamfnOf2nzh6GG8zMvj0SkxFt243/QkN m5YqZDjgG1kqvCZPpQbhgzpGX32BfqKuUAZnWF2Degt46aFo45W8FZFOuf/IED7HG1FG 4iY1kCEh8pc+cT3SbHT74+rmOOuyJtjJxtSU1fCP98zFpbr6ZheUp2rtVPvQot7SFFpZ VN2ArSINAz+oF5RqsIGJiOXnsNcfpTrDp8uHeWJHvq4z1/c86rl+MQZc2DxuDBnjFXI1 NvdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679323828; 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=2ubabgTfuQRUHcQ6nKf64nxm8BOFtXJ8YmpeRNoMRoE=; b=ev3Yj0q4ptYlTCB7sBj9hh26oL9iZ93CaZRgdJergYh5j9F6FSqyVxYO54OwGitTtQ hb2pvI+pN9s1vyxVofMhjIf48HHRY6DZsJBXLlwf8IkOdC3qAThh8UgfTqu5c9qHIcxT JuvsHMYPvQxMvtz7L2L6TheYl/twTMWzvhZ9hEtpZ2JnLv8d1wSIXW6lKe4+37PNt8wH bDWlRH/JFYfxnyf10HOd6noMy7DdcUJCK8QVylXRXad40i4XciiApgVnLhU6Y396EnUb z3pqy0aCeL8rrq496Vo4wcZwmUEmLBlf6/dFXxefGwdokcj/K/rIhxedMpdBhEzYhMUH nHyw== X-Gm-Message-State: AO0yUKXMJELYl0Q/gDwS+aWtAcBtbJIj00qxMKEidZaLzdqm0iI3KBwW uyYgAsxg8dCIKyyqLVxvDZm4NQ== X-Google-Smtp-Source: AK7set+D0Rm41SOApjBFCQ5yh30ru/0ykF0WLXGC9d6vTpRvFPoE1Xf2cQLng+XR7vx5OJx3VBc/5g== X-Received: by 2002:ac8:5f86:0:b0:3d2:a927:21bc with SMTP id j6-20020ac85f86000000b003d2a92721bcmr25454885qta.18.1679323827850; Mon, 20 Mar 2023 07:50:27 -0700 (PDT) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id o14-20020ac872ce000000b003e03178112dsm2661003qtp.13.2023.03.20.07.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 07:50:27 -0700 (PDT) From: William Breathitt Gray To: Mark Brown , Linus Walleij , Bartosz Golaszewski Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Andy Shevchenko , William Breathitt Gray Subject: [PATCH v3 2/2] regmap-irq: Drop map from handle_mask_sync() parameters Date: Mon, 20 Mar 2023 10:50:16 -0400 Message-Id: <1f44fb0fbcd3dccea3371215b00f1b9a956c1a12.1679323449.git.william.gray@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the map parameter from the struct regmap_irq_chip callback handle_mask_sync() because it can be passed via the irq_drv_data parameter instead. The gpio-104-dio-48e driver is the only consumer of this callback and is thus updated accordingly. Reviewed-by: Linus Walleij Signed-off-by: William Breathitt Gray Reviewed-by: Andy Shevchenko --- drivers/base/regmap/regmap-irq.c | 5 ++--- drivers/gpio/gpio-104-dio-48e.c | 2 +- include/linux/regmap.h | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-= irq.c index 8c903b8c9714..a9337192ddd3 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c @@ -116,8 +116,7 @@ static void regmap_irq_sync_unlock(struct irq_data *dat= a) for (i =3D 0; i < d->chip->num_regs; i++) { if (d->mask_base) { if (d->chip->handle_mask_sync) - d->chip->handle_mask_sync(d->map, i, - d->mask_buf_def[i], + d->chip->handle_mask_sync(i, d->mask_buf_def[i], d->mask_buf[i], d->chip->irq_drv_data); else { @@ -915,7 +914,7 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fw= node, =20 if (d->mask_base) { if (chip->handle_mask_sync) { - ret =3D chip->handle_mask_sync(d->map, i, + ret =3D chip->handle_mask_sync(i, d->mask_buf_def[i], d->mask_buf[i], chip->irq_drv_data); diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48= e.c index 3516321c92b0..509864d36940 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -109,7 +109,7 @@ struct dio48e_gpio { unsigned int irq_mask; }; =20 -static int dio48e_handle_mask_sync(struct regmap *const map, const int ind= ex, +static int dio48e_handle_mask_sync(const int index, const unsigned int mask_buf_def, const unsigned int mask_buf, void *const irq_drv_data) diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 4d10790adeb0..6e18d8b405b1 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -1644,8 +1644,7 @@ struct regmap_irq_chip { =20 int (*handle_pre_irq)(void *irq_drv_data); int (*handle_post_irq)(void *irq_drv_data); - int (*handle_mask_sync)(struct regmap *map, int index, - unsigned int mask_buf_def, + int (*handle_mask_sync)(int index, unsigned int mask_buf_def, unsigned int mask_buf, void *irq_drv_data); int (*set_type_virt)(unsigned int **buf, unsigned int type, unsigned long hwirq, int reg); --=20 2.39.2