From patchwork Tue Mar 2 23:47:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rikard Falkeborn X-Patchwork-Id: 12113853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D38C2C433DB for ; Wed, 3 Mar 2021 16:38:48 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A64B64E6F for ; Wed, 3 Mar 2021 16:38:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A64B64E6F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=WCM9gAaWWBFeRV8H+wgnCiAGQa9Nbc2PjcUS0JiQ9fE=; b=pHPiQ+G3sNr5VUMVDQHdV30Lx9 cAttiebZBr43HLXWINDJgW250tH9y1Zb4pg8LHn3MgEZh4SNydC6PrcCzeRhRm2jLHtpMu2u7yB9J m8d/wBNKQ7hbsViqHZTKk6+fQ282P1WZUf9qLIhuYQ7TTk4TlXG/UB/E8DUTApsPbJbGMTLf+ZEQ4 zYF/NhbdSk74JsRboZmzNCiYh9N1Rb6hahdPcjVCOz5J4XSVt7Gcw2QGd18d7BMk5WGFbv0EHRyTX f8By2tRZ3wucYrLdqV5Ha+yNs7pVkKk9usvz+DnThlgLz//CksOT03cbGtHwF8t2jCPjJGUoYLIHX qJEvF+uA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHUUL-005d8c-NJ; Wed, 03 Mar 2021 16:36:42 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHSpx-005E65-IW for linux-arm-kernel@desiato.infradead.org; Wed, 03 Mar 2021 14:50:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=LS4d4uUxDq7yhtpjLQE7kDOpsO4KYhMcEce+00T9U+s=; b=ftECUkHkhyemP5AEh3JE54V1us c3SgUaXeyCPWG3WcVWeEJIPR62ScllF0QCMgpJ+d+qSIMS1A34PMgF5JxVEbIZAiu0/JkAHJnOaSG bejgGQ8l/nX1PXN+yfx5e3edzQB6y1vSjAs1ADImUdRUAOZT1kiv/zoGahCKQcqJZdk+lZJ+htDy7 BxTdkwvJ7O3cA9WRsdcxjF4/C8+oKn0lCUDobi3uXktx98qiaojBgdk1lVZlCV9HLPXYh/zJXSwSs a67mQ7yUhhVXCFsYdOIJGqJe8fdxov700uOGwUHAea5TPS3MxiAQ9y4iFqva2rdTp7jzRKUsZutQU r9SQ9Pzw==; Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHEkX-000f4H-SR for linux-arm-kernel@lists.infradead.org; Tue, 02 Mar 2021 23:48:22 +0000 Received: by mail-lj1-x22d.google.com with SMTP id 2so21753422ljr.5 for ; Tue, 02 Mar 2021 15:48:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LS4d4uUxDq7yhtpjLQE7kDOpsO4KYhMcEce+00T9U+s=; b=b2YvmtWceuUdn6lRyC69kZzsj1GrBVdKv/s37uBMpqnrZeFSFFX3v7i6xMxDXM0DR1 3S5dN2pEfvAef3sPnfgVkmEU3K7V/vJq9ZpXQW43ps/9hu1KxRmJiYKJ3P1wDPufQdln b482GFvnPEz8YRgub0ODGDSMeNZWts5Z1KBKxazzoxwhkFFIIEr49PX7KisrzY4L8d29 2DF1zgd6B1P/twHqi/XfuHR3dUcQjsFZdjpD7PTqTJty0smvB+kLU1cs4/8RagQVII2S lJGjneBExfZnY4mmoqynG7aZlywjm/znyxLx4Ppbl/Pkv8lbwfth9qPpS4zT1fvo0/eU bkVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LS4d4uUxDq7yhtpjLQE7kDOpsO4KYhMcEce+00T9U+s=; b=E2BqT9WXRCp3Q8pqfRTgWJEUMZ+imy5Kn2GfNcd8pt/GaRHP6ISXVda/s5cP2BPa3I z8ioTh0CKBLLxm8G9+5C32eGdgmD/hff/LSHKli2BJrpczwk5WLuC0ku2SwxUAvx8Ubx X0HK/n86XVN9INLBVWrTU6OvOg0oAhrqpmLZhHu2WzU7ivyMcwdtsMkOw5lPoEz0ab4e AqutCN+aYbBner2TXR+AnvhTC3yy0TMZk5r/ZEdp4uHy90WUffDGmx/r4Gue12l+8JDX W+1spf53otY+FBJHXgaD6ZwvvlV0Lq5xMwLeWbf8HxerTpo3qdIoObPYolBi0sMfIsPu 3gNw== X-Gm-Message-State: AOAM532XFZR953IFZynP9wn6ZEWT5LJ8pggPz+OpMWOuCJ6L252f3RIo LBJYHHoPPJzSO8XkjgXja8Q= X-Google-Smtp-Source: ABdhPJy5L1J338j45dySxGdt1O0nFPc4P4bq9ZZ67C0FYOxtdRwp0t/z2lccEUEyzMGMCigXG4BIZw== X-Received: by 2002:a2e:3c13:: with SMTP id j19mr13431079lja.130.1614728835186; Tue, 02 Mar 2021 15:47:15 -0800 (PST) Received: from localhost.localdomain (h-98-128-229-129.NA.cust.bahnhof.se. [98.128.229.129]) by smtp.gmail.com with ESMTPSA id j15sm1974359lfm.138.2021.03.02.15.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 15:47:14 -0800 (PST) From: Rikard Falkeborn To: Lee Jones Cc: Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Rikard Falkeborn , Andy Shevchenko Subject: [PATCH] mfd: stmpe: Revert "Constify static struct resource" Date: Wed, 3 Mar 2021 00:47:10 +0100 Message-Id: <20210302234710.74455-1-rikard.falkeborn@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210302_234822_756609_21909EE9 X-CRM114-Status: GOOD ( 13.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Andy noted that constification of some static resource structs in intel_quark_i2c_gpio.c were incorrect. It turns out there is another change from the same series that is also incorrect in stmpe.c. These structures are modified at init and can not be made const. This reverts commit 8d7b3a6dac4eae22c58b0853696cbd256966741b. Fixes: 8d7b3a6dac4e ("mfd: stmpe: Constify static struct resource") Cc: Andy Shevchenko Signed-off-by: Rikard Falkeborn --- I went through the series and this was the only additional issue I found. Sorry about that. drivers/mfd/stmpe.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c index 90f3292230c9..1aee3b3253fc 100644 --- a/drivers/mfd/stmpe.c +++ b/drivers/mfd/stmpe.c @@ -312,7 +312,7 @@ EXPORT_SYMBOL_GPL(stmpe_set_altfunc); * GPIO (all variants) */ -static const struct resource stmpe_gpio_resources[] = { +static struct resource stmpe_gpio_resources[] = { /* Start and end filled dynamically */ { .flags = IORESOURCE_IRQ, @@ -336,7 +336,7 @@ static const struct mfd_cell stmpe_gpio_cell_noirq = { * Keypad (1601, 2401, 2403) */ -static const struct resource stmpe_keypad_resources[] = { +static struct resource stmpe_keypad_resources[] = { { .name = "KEYPAD", .flags = IORESOURCE_IRQ, @@ -357,7 +357,7 @@ static const struct mfd_cell stmpe_keypad_cell = { /* * PWM (1601, 2401, 2403) */ -static const struct resource stmpe_pwm_resources[] = { +static struct resource stmpe_pwm_resources[] = { { .name = "PWM0", .flags = IORESOURCE_IRQ, @@ -445,7 +445,7 @@ static struct stmpe_variant_info stmpe801_noirq = { * Touchscreen (STMPE811 or STMPE610) */ -static const struct resource stmpe_ts_resources[] = { +static struct resource stmpe_ts_resources[] = { { .name = "TOUCH_DET", .flags = IORESOURCE_IRQ, @@ -467,7 +467,7 @@ static const struct mfd_cell stmpe_ts_cell = { * ADC (STMPE811) */ -static const struct resource stmpe_adc_resources[] = { +static struct resource stmpe_adc_resources[] = { { .name = "STMPE_TEMP_SENS", .flags = IORESOURCE_IRQ,