From patchwork Sat Sep 9 02:42:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiji Yang X-Patchwork-Id: 1831746 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=g/fx++fp; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=WexbEn1c; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RjHRk0StGz1yfm for ; Sat, 9 Sep 2023 12:46:23 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=wHqDvpcHqtTK9q4vreHGeAd+S4Rhdyf8SGZqHoYLnOc=; b=g/fx++fpDVm4kG 0c5zpGlWCfTGaGaF5cmHUr8bBv8dz+Aw34azRSMMnjhAKpC824cLxAtaM8mgPmp4W2C04aNcsiZbF CwIrnMEVcGPuuxBVCP1hiNPmlhVN7G8bdUf9XvT3oefH8nyx8weR3b0OKiCRkd3hZLq/tWd3NHNst yWxhw9zQT/lxtCYdIOqgPadN/gA5TDpPxaXiur7ixRTYFJu6hvv6r3wf5qVh4oKhgiS0r3leuV+Nw 1eCZWSMAcDbXS3zG640dXzHA82anFXhlQzvFvHArpESfdplU49hy9LdcQLmt/1KNV85QKiWghgAjC wS6LdI9wUiBW1ku0bzWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qenvz-00Etiw-2W; Sat, 09 Sep 2023 02:42:55 +0000 Received: from mail-os0jpn01olkn2081e.outbound.protection.outlook.com ([2a01:111:f403:700c::81e] helo=JPN01-OS0-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qenvw-00Etia-2u for openwrt-devel@lists.openwrt.org; Sat, 09 Sep 2023 02:42:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U8XKZqbwArMjLUQVdsmpC1Ujwui4GAX6A7eVnrDptH4hVIsNbtYq1Xs/UJYP1CeqglqJNpBmxRRhwnJOu/cvoDdLN1wGYsFMNrxxkD+y566Ra7KaI0FNI0irrUyI3dUe6IH2xgkkWocY9GyjeIDRdKmOzd7DK8g262MLkyKF8ifbkWrygQMLhkT+H3SG/oSURkIpWhCayraQhVA5qysiAFGh2AS9QZljuO5mn5Php1N1+rrtzWa5kC3Oj9MaMlDjbL5iftyH0H9RVcgqIplcGEplfgebedqeTo8zEDvYwhUaXyEhaYLgvNjFFGsB8EqX5rJwJhFBKmv5uOvRAhbW+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iMwsS93clNKO9cNwoK1LZ+pEo/jFELOv2a6Kssx2WuU=; b=a7/NXzite7bsOoGdzcskW/sF3XeRnXbcfp8N9MPLVUnMJaQMPaVKuzAr17daUg3OqQfZ9XEhd7xSUKf5eI9/JBokjRhNMAghssDSGW6ztLd1mnEF5J0faVm8yrUGe/B0MfdfstpyLVk4Ha+5PU46smINO4DbJ/DI7iy4uGQsjqI/2X8fuJGZ85cJMf6R8KGXTwf9h0a9Xw5SelgFqzSLFQsKDCaCR7GX6/jh1H+1+55h65q++DeUfZGwqM3dQSyLIU0XoZb23hUmSy1ABsjNwse8Helt3q9/fEmJQdCEm4a4wR7IZsyLBGbyxI2YkqFspY0g9qJdUSxkzbIrWej6sg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iMwsS93clNKO9cNwoK1LZ+pEo/jFELOv2a6Kssx2WuU=; b=WexbEn1c4+0uxebjFHT0wnBwQ/XzrrPHQkZdKdqY3x9+/pKHvSkZvg+BDOgkWMEttuhqddJR9pR/ZCSK7O9d8c+rdl/XZNG2BSCckRdyUINS8xa0N1yzTz1ObEDCGszrTmNrVLzWbPqGEGdEzvpYv/3kYR67avOjey/6ogKGEBei2MyHAv1Vl2buXFzCmLTSoUAyHPCG1KJvryrv41PYziYYSimEr9LKfJXT8vrDzW4A9oQHxYw5xxri+pvFcPPaNh2+cQz9e18ag4mQBTgln3vcttCKPyn/72/NvNGZ+iFyliwF6fVBRHhyF4S4anhpHxS3pB779ecKAgLkPKIrBQ== Received: from TYAP286MB0315.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8041::8) by TYCP286MB1852.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:101::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.10; Sat, 9 Sep 2023 02:42:38 +0000 Received: from TYAP286MB0315.JPNP286.PROD.OUTLOOK.COM ([fe80::f4c2:4b38:d074:f1e9]) by TYAP286MB0315.JPNP286.PROD.OUTLOOK.COM ([fe80::f4c2:4b38:d074:f1e9%5]) with mapi id 15.20.6792.009; Sat, 9 Sep 2023 02:42:38 +0000 From: Shiji Yang To: openwrt-devel@lists.openwrt.org Cc: David Bauer , Shiji Yang Subject: [PATCH] ath79: fix MikroTik CPLD driver build error on kernel 6.1 Date: Sat, 9 Sep 2023 10:42:20 +0800 Message-ID: X-Mailer: git-send-email 2.39.2 X-TMN: [Ss0hej7Gthum74iqfgsxLylr5gZ/WNgQ] X-ClientProxiedBy: SI1PR02CA0053.apcprd02.prod.outlook.com (2603:1096:4:1f5::8) To TYAP286MB0315.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8041::8) X-Microsoft-Original-Message-ID: <20230909024220.28548-1-yangshiji66@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYAP286MB0315:EE_|TYCP286MB1852:EE_ X-MS-Office365-Filtering-Correlation-Id: ee75e013-846a-466e-d203-08dbb0de6de1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ki2s55Zaq3g9JbF3Ht5CgMBCZtE2K6eZ4Gp0Vqfp3eHMpWCdDn8ltIzg377XRZ9a8RYLe0S4dDcrdF1NwvD72vLocBcQLr71vtdboeNUcmOyLXo+VY8SODQHG3RPt7tFyffnPzlrPWndqR/JOjWt2fU20wKpWM6cdkYXiqKgdJvtjUpbcn8u6uXVLRb/TM3W6CSBCva7egHFGxzt34mektYVvA3Ge+vdpuq6n9wWm7mKYaPN0M1ct8SScbbCQ2wNMpaE2Q0AFUo5tUEjIhIAVgIdf38ReROyDkWLdlDu/mwCykVarvOLySp2P3Kl5yZ0OcB3AaTx4YGj9AN3792ccqR1ajLYR9F9LUCktsVqsHk5nPRKFvP64G3R1w2/24N2x64fO9tUbARc9xvAWEuxFKQAHDdT0O+8im+U0KqQN5wygBJaZ3n1KyMJAilf8g3y8FXR1QjAY6cDqmu9qndymYjb1OCJRXa8lP2JuF3fcFIQAC6HMQAk8aV5f9LbYYgbrEB6v8uWUO2IjkEXUhupXSSgCyYeUjN+2ELczoz8Pcfjt8o1TrW9BxMXzmDlz37G X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CnVSwbl+6lLF189+Rwj1i1FyZhQ33wvT83oTE+AYMzGAYOOo7pcQxMEEH+OxQiIgriFtt28VvtfgfzWryh/QTIxCWmKmx5IkExHNZufgSDmM+iXQ3FSmzrDqTqZRC7epE9dp/mHTSsg7/rXOcFAAqy880xmXtSQ21HDdWWogkgRZwONgmO+1t/bSA5ODR8rMNvb6aSAbkKmPZzoFy7i2YeOTN1GtHlk6T2cyO7JBx+fwCA3VQC2SJ+E+Va2JLS5KkL55RDHC7vtQKddO8DO1EAnhSgZx/k8qG7q0rGM8yw5HjLUPdZ8N5sMfzb2x5V5A7UIP2WQU90DPm0nYl95AVXgVJIcn0Rr4qRywxId7mqXZwxY02+PDmy36V/5phg1BnEuIgkUJsLfzSm151WB0l34tOIWqmJxynOVg8/W2ZTjIjKwec7ll+DEvYWm+64Nwlmzw33WMb5WubcO5L+QAx/Ii1/LIIERqZ+HZ4c44opxlPXQNdfnnRLhnamE96Xs4Qg7WFIFAQ9XHKlVko0jEvKkoNNQ1p7Xq3nXtnMR+uvT4/oVXKew+bSiO/xV7IQiUFqf1NRO26xoQZAsK2Abam8YReoU3X2gUrIoNyJpnOawo9M5fCjdhxVj+VCNrXmQ/I/BTyziVcu15iSngZtgo2M3W65oBZYZav7MRBo/EIh+mFQm0hxrKEWYqC70KyA0uuyYGQrSCp/BUagzKocZ1/fgPIllf3Brr+c4mAychAdnLRymiyRqjr5UbljQjdpCRMEg8SwoX+yPVyROwwGzgBHte+6akn63PO3BdLdaJJBGfn6snLygPD4Udt61h7UuwGbE57bNaKRyUT6Kbe0yRT1+W6GdSMxMbUIblPQUdfaNiDHO2lE5vyFEWUFWLxbNOEqACGetEPL7ozpPU0fG4eFUAgBgFUUwZGElykyrFo7cVUb2hStV1Uw1khUGB64eCa040/Y5eTG3WJzbnTUrMsilzmaNbcDUGaKy9iHl0BlVWrUhe9sBMvU4Totv0nOHjN8TLzJN2kx0HV1Hn+2uMgjRwXIj7ZfQfgsRY0lwwhckqfVrmsxqBjwMEYMy6CvO9l2KdSFbW1L3j6cQHkOty01gNiCfdF5gDR6boNMKBBBl+HIaTYpFLUbrtox3r/9JvFGTK7yAqnnk9NPKXNpF634HZzQ8wBBMCNn5BEx1RQiCWsBiNyQkSevjQA//m+OrIo+t+C2lyOVhnPCPHhKHZWKevVDWwZ9S/WDQ1aMpyY0U= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee75e013-846a-466e-d203-08dbb0de6de1 X-MS-Exchange-CrossTenant-AuthSource: TYAP286MB0315.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2023 02:42:38.0863 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCP286MB1852 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230908_194252_974514_BFFF4C31 X-CRM114-Status: UNSURE ( 7.80 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Shiji Yang Since kernel 5.18, the return type in device remove function has changed from 'int' to 'void'. Signed-off-by: Shiji Yang --- target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c | 6 ++++++ 1 file changed, 6 insertions(+) Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yangshiji66[at]outlook.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [yangshiji66[at]outlook.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Shiji Yang Since kernel 5.18, the return type in device remove function has changed from 'int' to 'void'. Signed-off-by: Shiji Yang --- target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c b/target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c index da18424c63..f10ddef9e2 100644 --- a/target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c +++ b/target/linux/ath79/files/drivers/mfd/rb4xx-cpld.c @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -151,9 +152,14 @@ static int rb4xx_cpld_probe(struct spi_device *spi) NULL, 0, NULL); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) +static void rb4xx_cpld_remove(struct spi_device *spi) +{ +#else static int rb4xx_cpld_remove(struct spi_device *spi) { return 0; +#endif } static const struct of_device_id rb4xx_cpld_dt_match[] = {