You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
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();
|