From: Ioana Ciornei Date: Wed, 3 Jul 2019 14:56:38 +0000 (+0300) Subject: bus: fsl-mc: remove explicit device_link_del X-Git-Tag: v5.4-rc1~186^2~23^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eadf0b17b43db4e73a6bdde1ad745d3b582a71c5;p=thirdparty%2Flinux.git bus: fsl-mc: remove explicit device_link_del Starting with commit 72175d4ea4c4 ("driver core: Make driver core own stateful device links") stateful device links are owned by the driver core and should not be explicitly removed on device unbind. Delete all device_link_del appearances from the fsl-mc bus. Signed-off-by: Ioana Ciornei Acked-By: Laurentiu Tudor Signed-off-by: Li Yang --- diff --git a/drivers/bus/fsl-mc/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c index 8ad77246f3221..cc7bb900f5249 100644 --- a/drivers/bus/fsl-mc/fsl-mc-allocator.c +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c @@ -330,7 +330,6 @@ void fsl_mc_object_free(struct fsl_mc_device *mc_adev) fsl_mc_resource_free(resource); - device_link_del(mc_adev->consumer_link); mc_adev->consumer_link = NULL; } EXPORT_SYMBOL_GPL(fsl_mc_object_free); diff --git a/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c index 3ae574a58ccee..d9629fc13a155 100644 --- a/drivers/bus/fsl-mc/mc-io.c +++ b/drivers/bus/fsl-mc/mc-io.c @@ -255,7 +255,6 @@ void fsl_mc_portal_free(struct fsl_mc_io *mc_io) fsl_destroy_mc_io(mc_io); fsl_mc_resource_free(resource); - device_link_del(dpmcp_dev->consumer_link); dpmcp_dev->consumer_link = NULL; } EXPORT_SYMBOL_GPL(fsl_mc_portal_free);