From patchwork Wed Aug 19 11:33:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1347725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=XDJMiBrg; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BWm3D0SX8z9sRK for ; Wed, 19 Aug 2020 21:37:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; 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:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=56adcCEwBnZXuXXgD4HbSsMMANPo7x5Q6lTojexBOCs=; b=XDJMiBrgvRwjq9d+Z+cx21CKvW BtCWPAVWFOtas876HnNyeEQvKQJEW+xLTIZbpO/kyoK+IX4m0EMyhHDRYQgv9stf/FcN52hTTFSX3 DjQhoBzIi8pkVv5z/FRBAKbd+bRSX+YEtqZ/qrUqDn+GbKcOP8L9UTjVcYiylQKRHfCSsVweFXSF0 QuTOfHe+DzPgBaOfP635wLNcc6I8sZxP0Ide+IE+avfSGXy7cj5CwOYqpB97kLqCD+an6yGJR+y9o fKY8sb+46odWI/1LuKVxp0bn57gEVzOdi7p7KzRpT3x6hwE2i2nj3YhmCxxDZmnshyQEsUoyv4jYO mC+89wgQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8MMw-0002JQ-BX; Wed, 19 Aug 2020 11:35:02 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8MMt-0002Ii-03 for openwrt-devel@lists.openwrt.org; Wed, 19 Aug 2020 11:35:00 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mw9Dg-1kyG663wKS-00s5f2 for ; Wed, 19 Aug 2020 13:34:55 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] bcm27xx: remove no-op patch pair Date: Wed, 19 Aug 2020 13:33:42 +0200 Message-Id: <20200819113342.59086-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:jmZooikZ25n4jhMDhuRqdc8CdvJBP0JKN4jpnB45VQ6xRnTRgrA tnjJF9hnHyEC8Rp5Rt/2gr1R6h35GmeIqfidjqZ/kQLEs+VyIDp1kO4H3xPPB4LNqkzfQNe xJUycOYAR07ojXcyvOjR3BK4rBLyddHS9YFW7XUgv3nm2MOiHuMspM7fN2K6GR/0Qz5FyDI 4wtFyrdLMxzPCEC192jhw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Ky5lvznvjfw=:LVjYv4SkKJyoHxRlN9Hhte uGCL4X44C+kAgmIeyG1Fq4PXjjy/b68DHE3aEEmZ0WJMS+HBPoyZNIszjaIwNdZObinqKjP4y OMVeMtJKnvo6isOXjavCbyfQH7rV7KlRbNNWIdOlrrYzRgv7YAR2Eth3/M3LiQ2oF9SPqtJjC m37spxgkiNkK/Bv3MqIE9hi6sRwwAafUIYKEIn8a1QQ26g9jVo+uZLCN0ZGWp/jL801ZOWQPi IMFlwChn5AmZoKOIkEM7HJCxe2ECV1hGhVAuQb3xAkHoLe0yLIF0DkxzZQLZIYRvu7LoB6+m9 DIdBXaSIv9t9P0LCJGbO0ddSo8isjRw5w+XwPYAHskGGoX1MSw4DPpc4Ri4Ml2qF0wH7Fnwwn fIBsUHxwGNuyEPeO8+MnNnJBdWsQvkyHl34pBUhVMbdxanmAPZypgRGhmfQww30MPA8UO2/VD K5wf/mhXx2QruTmGE2re7eeRuEc+vzul0wWjoCjfdN08BYB7QgnTPdxKTB6R64AsBqjQm2/kL vWYbn5gKllqaTD4T+bRrPxv534lN0teTWSHvSx/DLt366JNwXq52DGYgFiPYxNDgBj6/KZpmz fjkp0QvnrxaMObC143DePW6htmgLze6k31Sv1CeuYMBCQjIcHBxTfjPj3xWlTu4KOs/0ThMv6 2yzBF+HY+1daAnloAA9IfXTYcl76RY27N5J2u8NAxqQNXhc7iHGLysnwuNJfUMPWJ5En4QMLu 9IGapDNchN7+pH8k4kAO5TNmNY3DN4wJQE02efz6ai4La40dCx0FjZL3TFYz25vX+/fjTAPGY 46mOK/fq8ov/TSI0IrcivGRGHiLG1a7p3N9gGsrPY9ApTtsO5OPmd8s7OSV3Muhshpi2inNDz bQO3R62RSt20rqP0XYrA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200819_073459_267366_B2411F13 X-CRM114-Status: GOOD ( 15.65 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.134 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.134 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 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 Patch 1 introduces a change, and patch 2 reverts it again. Remove both patches and achieve the same outcome. Cc: Álvaro Fernández Rojas Signed-off-by: Adrian Schmutzler Acked-by: Álvaro Fernández Rojas --- ...m-Fix-platform-device-unregistration.patch | 27 ----------------- ...m-Unify-the-unload-handling-of-platf.patch | 29 ------------------- 2 files changed, 56 deletions(-) delete mode 100644 target/linux/bcm27xx/patches-5.4/950-0163-staging-vchiq_arm-Fix-platform-device-unregistration.patch delete mode 100644 target/linux/bcm27xx/patches-5.4/950-0338-staging-vchiq_arm-Unify-the-unload-handling-of-platf.patch diff --git a/target/linux/bcm27xx/patches-5.4/950-0163-staging-vchiq_arm-Fix-platform-device-unregistration.patch b/target/linux/bcm27xx/patches-5.4/950-0163-staging-vchiq_arm-Fix-platform-device-unregistration.patch deleted file mode 100644 index a5300ca309..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0163-staging-vchiq_arm-Fix-platform-device-unregistration.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7ba7db27d18d141973ad7eaf1f339218d81a31a4 Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Sat, 13 Oct 2018 20:51:23 +0200 -Subject: [PATCH] staging: vchiq_arm: Fix platform device - unregistration - -In error case platform_device_register_data would return an ERR_PTR -instead of NULL. So we better check this before unregistration. - -Fixes: 37b7b3087a2f ("staging/vc04_services: Register a platform device for the camera driver.") -Signed-off-by: Stefan Wahren ---- - drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -3258,7 +3258,8 @@ failed_platform_init: - - static int vchiq_remove(struct platform_device *pdev) - { -- platform_device_unregister(bcm2835_camera); -+ if (!IS_ERR(bcm2835_camera)) -+ platform_device_unregister(bcm2835_camera); - vchiq_debugfs_deinit(); - device_destroy(vchiq_class, vchiq_devid); - cdev_del(&vchiq_cdev); diff --git a/target/linux/bcm27xx/patches-5.4/950-0338-staging-vchiq_arm-Unify-the-unload-handling-of-platf.patch b/target/linux/bcm27xx/patches-5.4/950-0338-staging-vchiq_arm-Unify-the-unload-handling-of-platf.patch deleted file mode 100644 index 9bcd967b8a..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0338-staging-vchiq_arm-Unify-the-unload-handling-of-platf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 91da858c9327352c17a1f20ec10e78113ed45c82 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Wed, 6 Nov 2019 13:58:18 +0000 -Subject: [PATCH] staging: vchiq_arm: Unify the unload handling of - platform devs - -A helper function vchiq_register_child was added to deal with -adding the platform devices. This returns NULL on failure, and -that is assigned to the struct platform_device. There is -therefore no way for remove to encounter an error pointer, so -checking for IS_ERR() is redundant. - -Signed-off-by: Dave Stevenson ---- - drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -3268,8 +3268,7 @@ failed_platform_init: - - static int vchiq_remove(struct platform_device *pdev) - { -- if (!IS_ERR(bcm2835_camera)) -- platform_device_unregister(bcm2835_camera); -+ platform_device_unregister(bcm2835_camera); - platform_device_unregister(bcm2835_codec); - platform_device_unregister(vcsm_cma); - vchiq_debugfs_deinit();