From patchwork Thu Feb 16 22:32:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan MacDonald X-Patchwork-Id: 58273 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp564809wrn; Thu, 16 Feb 2023 14:37:35 -0800 (PST) X-Google-Smtp-Source: AK7set/qksa3d5b9OGP327ZfEv+CHWpNy4P/QthjHZUCnJmCvQHklRGJBNv0eGs+6FHFY6eVRSeD X-Received: by 2002:a05:6402:328:b0:4aa:a4e9:fa28 with SMTP id q8-20020a056402032800b004aaa4e9fa28mr7053021edw.34.1676587055743; Thu, 16 Feb 2023 14:37:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676587055; cv=none; d=google.com; s=arc-20160816; b=C2Vr8ucxXSLjkzfGkXLQ46t+YuUMXWyF3jyC/0YazcooqmxnQ63yRGMGux2MJTGefd satTxuDBKwFCKRx4+Cst46/gWqi0SXK2CrTVeejQ7P5Cn1N5xlCbESoQ29/LmdhmD1v6 0NYHLAQ9hz7vMXEzZ6k7iD6+WejYnnzjqwZIbJSZdmmLrHjq5j3vhAAT3IkhyQAgRk9L EOee9vCdFzMAjYAGwr/cHye7D7pf1DEoOZzbfhNti6TWCEQMlhmBReW9UUMAMQ47pfve vYkx0hMrhxHvyaebYe8cuyM5pBHpQfLtBgMid7hiRMA/qyY7xcAXPhm8b3xYpVDVeZlC OGow== 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=GvzIXeBwNjkQ9IcRgD+ojwStnjrbesfxRf+gfVkqoyc=; b=OOeBjzRypHjSadjsKSZcabDSos08MWX7MnjEqIeRsH2iMmWcmEE4pzIB9pzSlt6TAu NkBLI0otI1GjVU8kIntPwNUewj0UeRZd39OAYi/f85rQTAK+F9TNPutO7qKfOs+Jpd5r d321+llHRuv4koq/DHwO+EwmwdyrywJ4e59mu0XPmegl4EPPZDholqxQRmbWzwoVzLDC 6vp44pUcdjvqVTfFb5iBtpLX9ZFr3Fx8AP7Kd6BeVINDuipEetG7J6vIBcAWEYsDJxdN /f+GgT5OBj1E5TSSQ0HxWjFcvkZ5gNa46JFpb6mbMPt6V2nhLlWbphXNNcveCILaLOmk lajw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VYSoiJSa; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n8-20020a05640206c800b004accac1c5d1si3004174edy.566.2023.02.16.14.36.56; Thu, 16 Feb 2023 14:37:35 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=VYSoiJSa; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230092AbjBPWc2 (ORCPT + 99 others); Thu, 16 Feb 2023 17:32:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbjBPWcX (ORCPT ); Thu, 16 Feb 2023 17:32:23 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 897F748E1B for ; Thu, 16 Feb 2023 14:32:13 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id r25so236732wrr.5 for ; Thu, 16 Feb 2023 14:32:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=GvzIXeBwNjkQ9IcRgD+ojwStnjrbesfxRf+gfVkqoyc=; b=VYSoiJSayRXtEYIfR8Hy8SoP+yEE+4aPstU32fxzv5Uv2KYLidAt0mnkgq9qRjhFQH N+qYUmdwHlx+cytXSNZOXd+1lhJMUx/5geurMPuUXks4mg2wVSntprJhdqMe/AQhge68 I3EImvVp+OZO5QFx0cMQuV7OSMZs2EkxYRJNNJJu9WSIc9Dtve/SCyEQN0vScAJ13EPV LVQ/8Vcnwvu2PrK5N6twcb83zE14eUX9LKpqtwEOoRYLozYJ05+Xu3UvogLMhy/k4cNu VILMMrlcZcnM321b/XzFiShTZlteeHKs0K/4Gve3/xwlAWNt6CwfJDDCkZt18GQTJ8/C kbXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=GvzIXeBwNjkQ9IcRgD+ojwStnjrbesfxRf+gfVkqoyc=; b=0alU1GKdhZEDN/ELnPG2drz90GWWy34jkxw/jejYfzSzY5iFjBrafIrZnyfiRcqGvr +/V9EGNke25V8I64DJE8aHurXlNeB6YduWojXIFenGy7Yl3QJOu4F2TaVoCoAr+WWibi f1MJ88ylMD3VkaDjH9oZ6nJWEEgkkuAGfgR+VqEhFpCxPtW33fSfukAuf2qiga5x25FK 9yLtWGeEVVMzboEuTH3nz2wOYqm5hIyxM7DB9Hdl5sQT6e1kBrxS1NZvFe1P+SSxAU7P dm4FckgvrYRTlOyB98n+YG3udVSEYWxGPNHssi1cXmFoNX6EMI6AH4hlbJ5AfZZfbl0r xTVA== X-Gm-Message-State: AO0yUKVUNrOSZrVdn9uGsGvmLTAJXjbUkNnCBFLluLfh7c6HUN+Oxz9Z aN/RCAAnU57UeuSrjltPIXsvyiMhrzI= X-Received: by 2002:a5d:5502:0:b0:2c3:db4f:f336 with SMTP id b2-20020a5d5502000000b002c3db4ff336mr5456407wrv.39.1676586731996; Thu, 16 Feb 2023 14:32:11 -0800 (PST) Received: from localhost (94.197.187.145.threembb.co.uk. [94.197.187.145]) by smtp.gmail.com with ESMTPSA id k8-20020a5d4288000000b002c559843748sm2600774wrq.10.2023.02.16.14.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 14:32:11 -0800 (PST) From: Aidan MacDonald To: broonie@kernel.org Cc: gregkh@linuxfoundation.org, rafael@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] regmap-irq: Remove unused mask_invert flag Date: Thu, 16 Feb 2023 22:32:00 +0000 Message-Id: <20230216223200.150679-2-aidanmacdonald.0x0@gmail.com> In-Reply-To: <20230216223200.150679-1-aidanmacdonald.0x0@gmail.com> References: <20230216223200.150679-1-aidanmacdonald.0x0@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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?1758028948961746855?= X-GMAIL-MSGID: =?utf-8?q?1758028948961746855?= mask_invert is deprecated and no longer used; it can now be removed. Signed-off-by: Aidan MacDonald --- drivers/base/regmap/regmap-irq.c | 14 -------------- include/linux/regmap.h | 4 ---- 2 files changed, 18 deletions(-) diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index e3092f522107..8c903b8c9714 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c @@ -878,20 +878,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode, */ dev_warn(map->dev, "mask_base and unmask_base are inverted, please fix it"); - /* Might as well warn about mask_invert while we're at it... */ - if (chip->mask_invert) - dev_warn(map->dev, "mask_invert=true ignored"); - - d->mask_base = chip->unmask_base; - d->unmask_base = chip->mask_base; - } else if (chip->mask_invert) { - /* - * Swap the roles of mask_base and unmask_base if the bits are - * inverted. This is deprecated, drivers should use unmask_base - * directly. - */ - dev_warn(map->dev, "mask_invert=true is deprecated; please switch to unmask_base"); - d->mask_base = chip->unmask_base; d->unmask_base = chip->mask_base; } else { diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 2114679729ce..4b9ec1eb5235 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -1532,9 +1532,6 @@ struct regmap_irq_chip_data; * @config_base: Base address for IRQ type config regs. If null unsupported. * @irq_reg_stride: Stride to use for chips where registers are not contiguous. * @init_ack_masked: Ack all masked interrupts once during initalization. - * @mask_invert: Inverted mask register: cleared bits are masked out. - * Deprecated; prefer describing an inverted mask register as - * an unmask register. * @mask_unmask_non_inverted: Controls mask bit inversion for chips that set * both @mask_base and @unmask_base. If false, mask and unmask bits are * inverted (which is deprecated behavior); if true, bits will not be @@ -1616,7 +1613,6 @@ struct regmap_irq_chip { const unsigned int *config_base; unsigned int irq_reg_stride; unsigned int init_ack_masked:1; - unsigned int mask_invert:1; unsigned int mask_unmask_non_inverted:1; unsigned int use_ack:1; unsigned int ack_invert:1;