From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Russell King <linux@armlinux.org.uk>,
Eric Auger <eric.auger@redhat.com>,
Alex Williamson <alex.williamson@redhat.com>,
Cornelia Huck <cohuck@redhat.com>
Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de,
linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v3 3/5] vfio: platform: simplify device removal
Date: Tue, 26 Jan 2021 17:58:33 +0100 [thread overview]
Message-ID: <20210126165835.687514-4-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20210126165835.687514-1-u.kleine-koenig@pengutronix.de>
vfio_platform_remove_common() cannot return non-NULL in
vfio_amba_remove() as the latter is only called if vfio_amba_probe()
returned success.
Diagnosed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/vfio/platform/vfio_amba.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c
index 9636a2afaecd..7b3ebf1558e1 100644
--- a/drivers/vfio/platform/vfio_amba.c
+++ b/drivers/vfio/platform/vfio_amba.c
@@ -73,16 +73,12 @@ static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id)
static int vfio_amba_remove(struct amba_device *adev)
{
- struct vfio_platform_device *vdev;
-
- vdev = vfio_platform_remove_common(&adev->dev);
- if (vdev) {
- kfree(vdev->name);
- kfree(vdev);
- return 0;
- }
+ struct vfio_platform_device *vdev =
+ vfio_platform_remove_common(&adev->dev);
- return -EINVAL;
+ kfree(vdev->name);
+ kfree(vdev);
+ return 0;
}
static const struct amba_id pl330_ids[] = {
--
2.29.2
next prev parent reply other threads:[~2021-01-27 0:00 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 16:58 [PATCH v3 0/5] amba: minor fix and various cleanups Uwe Kleine-König
2021-01-26 16:58 ` [PATCH v3 1/5] amba: Fix resource leak for drivers without .remove Uwe Kleine-König
2021-01-26 16:58 ` [PATCH v3 2/5] amba: reorder functions Uwe Kleine-König
2021-01-26 16:58 ` Uwe Kleine-König [this message]
2021-01-26 16:58 ` [PATCH v3 4/5] amba: Make the remove callback return void Uwe Kleine-König
2021-01-26 17:08 ` Suzuki K Poulose
2021-01-26 17:56 ` Uwe Kleine-König
2021-01-26 19:05 ` Russell King - ARM Linux admin
2021-01-26 17:30 ` Vinod Koul
2021-01-26 19:24 ` Guenter Roeck
2021-01-27 6:47 ` Wolfram Sang
2021-01-27 6:50 ` Takashi Iwai
2021-01-27 8:12 ` Vladimir Zapolskiy
2021-01-27 12:03 ` Greg Kroah-Hartman
2021-02-03 13:18 ` Auger Eric
2021-01-26 16:58 ` [PATCH v3 5/5] amba: Make use of bus_type functions Uwe Kleine-König
2021-02-02 10:49 ` [PATCH v3 0/5] amba: minor fix and various cleanups Russell King - ARM Linux admin
2021-02-03 7:45 ` Uwe Kleine-König
2021-02-02 13:53 ` [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Uwe Kleine-König
2021-02-02 14:06 ` Greg Kroah-Hartman
2021-02-04 16:52 ` Russell King - ARM Linux admin
2021-02-04 16:56 ` Greg Kroah-Hartman
2021-02-04 16:59 ` Russell King - ARM Linux admin
2021-02-04 18:15 ` Uwe Kleine-König
2021-02-05 9:37 ` Uwe Kleine-König
2021-02-05 10:18 ` Greg Kroah-Hartman
2021-02-05 10:56 ` Uwe Kleine-König
2021-02-05 11:07 ` Greg Kroah-Hartman
2021-02-02 19:43 ` [PATCH] mailbox: arm_mhuv2: make remove callback return void Uwe Kleine-König
2021-02-03 2:57 ` Viresh Kumar
2021-02-02 21:35 ` [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210126165835.687514-4-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=alex.williamson@redhat.com \
--cc=arnd@arndb.de \
--cc=cohuck@redhat.com \
--cc=eric.auger@redhat.com \
--cc=kernel@pengutronix.de \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).