diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-19 13:49:30 +0200 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-20 14:19:39 +0200 |
commit | cc75344044e5c16cd4994d824db5779a5ac057c2 (patch) | |
tree | 41cb763230a00521d8b673fefc223562cf2f44b1 /target/linux/bcm27xx/patches-5.4/950-0338-staging-vchiq_arm-Unify-the-unload-handling-of-platf.patch | |
parent | bcf0704bd2ca852b1cbfa481095afb73e78287f9 (diff) | |
download | upstream-cc75344044e5c16cd4994d824db5779a5ac057c2.tar.gz upstream-cc75344044e5c16cd4994d824db5779a5ac057c2.tar.bz2 upstream-cc75344044e5c16cd4994d824db5779a5ac057c2.zip |
bcm27xx: remove no-op patch pair
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 <noltari@gmail.com>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0338-staging-vchiq_arm-Unify-the-unload-handling-of-platf.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0338-staging-vchiq_arm-Unify-the-unload-handling-of-platf.patch | 29 |
1 files changed, 0 insertions, 29 deletions
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 <dave.stevenson@raspberrypi.com> -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 <dave.stevenson@raspberrypi.com> ---- - 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(); |