Commit 5b495ac8 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Uwe Kleine-König
Browse files

vfio: platform: simplify device removal 



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: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarEric Auger <eric.auger@redhat.com>
Link: https://lore.kernel.org/r/20210126165835.687514-4-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 5150a8f0

drivers/vfio/platform/vfio_amba.c

+5 −9
Original line number Diff line number Diff line
@@ -73,18 +73,14 @@ 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;

	struct vfio_platform_device *vdev =

		vfio_platform_remove_common(&adev->dev);



	vdev = vfio_platform_remove_common(&adev->dev);

	if (vdev) {

	kfree(vdev->name);

	kfree(vdev);

	return 0;

}



	return -EINVAL;

}



static const struct amba_id pl330_ids[] = {

	{ 0, 0 },

};