From patchwork Wed Aug 19 11:49:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1347734 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=nbj1t1hl; 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 4BWmN41dcpz9sPB for ; Wed, 19 Aug 2020 21:51:48 +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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=06Ss35OeuK1ci25ui/MP/QeJHQpyJ3WkflNxCmvhp9Y=; b=nbj1t1hltJBcvuFXtlhMN8yKUu EIbZtrMfPUzUGrh791E6/pF6qfBeSR0rnNcoy/tuOykSUdiIY7cMgYFRFklb3iUTLm8ZtQL/Sn71c 7mzBpDz7rcsFXZzkyVryMTcVtFc4IgWM2XGnVNZHkoXpLQ2k3yxBzhZTxlAxYTwb9hTY7Y/f/hkZK PZROmyXKnumNXE6R3jqPtYGdrlKS7IKN/JjFCN4HrWfFEJeMNYrd+84Q3LWH9lkVYUE30G4CQqbay hy8ED0q+eOC+cT3A8ebe4UVA417669s1JKGtx8npBKX00353nvs/BJgnHCNIORsp74g6vpWMofyms FVViVYvw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8Mbk-0005M3-Qt; Wed, 19 Aug 2020 11:50:20 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8Mbi-0005LH-AV for openwrt-devel@lists.openwrt.org; Wed, 19 Aug 2020 11:50:19 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MrQR7-1kThFR2c91-00oYic; Wed, 19 Aug 2020 13:50:14 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2] bcm27xx: remove no-op patch pair Date: Wed, 19 Aug 2020 13:49:30 +0200 Message-Id: <20200819114930.12343-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:9/CnFIahpeDWizvYrorHGbYupPGbZIIE7+lm1219cOvJCwvkqzu jn4GRrOJAiERkwdgy+rvfib0l9Y4iOD8FlNJs9/UUb3qkfZ4w9BrP15z7MVFVGdMrGeG1WG yOVzqsxQBlpM4U1BNNV42qn+EUycpSZVHATJtf2AOszJo8uRtb6V1hARZdHLfkzDhSRorgP lEu2NyFktTgnjGHTIDSzg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:eA0rlRqHwgM=:C5bliYRcnj3Z1CEkSkv1Lu SsS8x/C9VmYanD1qhUEDbQ9fsFPOtDHOcOYNb2Z4T/XIUEjsEVh3c20u06iCVPIF3cD7aSu30 9lw3HpA1HeGbcdBW5xRkxMmP7AvPv0ISeC6AL65pxC7fMVtfLkUf3orHLuJ8ArU37lZVXr/02 wDBYBYMkM/tXpO8csD/kvTr/xtzOp9MWHCDMiQ9czt0yfM0hha+2o8j02kXV4HUiIygNaMh8p SSRqvtKtWGNf0lDKXht5BIhzxOJuwhR+qX7a67Q+kuNs5p8sNcKpGZ2oHW/JFhIqfsQP6U5D/ NyN2vBh+1Eok6j1UUxpT+fio2IK3tCwTvmQPX6mA2JA1RKRW7JoKK3c3MG/6lCvsn1X9lkV4V DZSGTpcvJO1efwXj0vfPVGXBS+Zn9nXAgF0W4fQeSaA3AnIIg9YWiR5j/2TL42G+oOMYt5Ijq sF9dseRDgsiQruwuOUQ9c1RSxDUl1gvDvteuepxfMexNZBs0kNhEIWJiKE64hrP0y2viaM4Tv c6iFweHXrAOPNxpzPBY6JwZDrk/IJc1hNLGDLfYoJq9bZbUzPKETWVIqKOnf3B4w35pVTJ8Gk C1w79o9kHkDSyjyuqq6gBQmdbkGY8aq5Gybq9eYEflW7XydzD4JhUbYkJIhnW6ZYNZ8Mrf3RL 792Z0+8MuSAgTb7PSoYlLLBEnxd4wAw8dBi61kEXICWftM4LkOk+N0mS2GDjiS0EeKMuwMKje 9cexEgiVEa1Fo5aDOi8mDDgYheL1x86kTS8Ugz6Q0sHM7F+aIcnIDzvea9bqL1pHTJscBnISV VxNU9lN7iQEZsYAPEy2/nN0iFyZrafnvZuzhi4gRi0bi7nI86ZCzD6qPphTsWNiQv/pSuY/Ol j0e/I9S72kYZidj4iH9A== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200819_075018_580506_969BAB08 X-CRM114-Status: GOOD ( 18.98 ) 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 [217.72.192.73 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.73 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: , Cc: Adrian Schmutzler , noltari@gmail.com 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. Refreshed patches for the target as well. Cc: Álvaro Fernández Rojas Signed-off-by: Adrian Schmutzler Acked-by: Álvaro Fernández Rojas --- ...m-Fix-platform-device-unregistration.patch | 27 ----------------- ...m-Register-vcsm-cma-as-a-platform-dr.patch | 6 ++-- ...m-Register-bcm2835-codec-as-a-platfo.patch | 6 ++-- ...m-Unify-the-unload-handling-of-platf.patch | 29 ------------------- 4 files changed, 6 insertions(+), 62 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-0335-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch b/target/linux/bcm27xx/patches-5.4/950-0335-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch index 28641fd327..7521434038 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0335-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0335-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch @@ -30,10 +30,10 @@ Signed-off-by: Dave Stevenson bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); -@@ -3266,6 +3268,7 @@ static int vchiq_remove(struct platform_ +@@ -3265,6 +3267,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(vcsm_cma); vchiq_debugfs_deinit(); device_destroy(vchiq_class, vchiq_devid); diff --git a/target/linux/bcm27xx/patches-5.4/950-0336-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch b/target/linux/bcm27xx/patches-5.4/950-0336-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch index 016e6c0aa5..499efe2b65 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0336-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0336-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch @@ -30,10 +30,10 @@ Signed-off-by: Dave Stevenson bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); -@@ -3268,6 +3270,7 @@ static int vchiq_remove(struct platform_ +@@ -3267,6 +3269,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(); 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();