Message ID | 20200819113342.59086-1-freifunk@adrianschmutzler.de |
---|---|
State | Superseded |
Headers | show |
Series | bcm27xx: remove no-op patch pair | expand |
Hi Adrian, Nice catch :D. I didn’t see this pair when I removed the applied and reverted patches. Acked-by: Álvaro Fernández Rojas <noltari@gmail.com> > El 19 ago 2020, a las 13:33, Adrian Schmutzler <freifunk@adrianschmutzler.de> escribió: > > Patch 1 introduces a change, and patch 2 reverts it again. Remove > both patches and achieve the same outcome. > > Cc: Álvaro Fernández Rojas <noltari@gmail.com> > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > ...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 <stefan.wahren@i2se.com> > -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 <stefan.wahren@i2se.com> > ---- > - 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 <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(); > -- > 2.20.1 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
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 <stefan.wahren@i2se.com> -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 <stefan.wahren@i2se.com> ---- - 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 <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();
Patch 1 introduces a change, and patch 2 reverts it again. Remove both patches and achieve the same outcome. Cc: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- ...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