Patch "VME: restore bus_remove function causing incomplete module unload" has been added to the 4.10-stable tree

This is a note to let you know that I've just added the patch titled

VME: restore bus_remove function causing incomplete module unload

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
vme-restore-bus_remove-function-causing-incomplete-module-unload.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Stefano Babic <[email protected]>
Date: Fri, 20 Jan 2017 10:38:20 -0500
Subject: VME: restore bus_remove function causing incomplete module unload

From: Stefano Babic <[email protected]>

commit 9797484ba83d68f18fe1cbd964b7cd830f78f0f7 upstream.

Commit 050c3d52cc7810d9d17b8cd231708609af6876ae ("vme: make core vme support explicitly non-modular") dropped the remove function because it appeared as if it was for removal of the bus, which is not supported.

However, vme_bus_remove() is called when a VME device is removed from the bus and not when the bus is removed; as it calls the VME device driver's cleanup function. Without this function, the remove() in the VME device driver is never called and VME device drivers cannot be reloaded again.

Here we restore the remove function that was deleted in that commit, and the reference to the function in the bus structure.

---
 drivers/vme/vme.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

@@ -1625,10 +1625,25 @@ static int vme_bus_probe(struct device *
 	return retval;
 }
 
+static int vme_bus_remove(struct device *dev)
+{
+	int retval = -ENODEV;
+	struct vme_driver *driver;
+	struct vme_dev *vdev = dev_to_vme_dev(dev);
+
+	driver = dev->platform_data;
+
+	if (driver->remove != NULL)
+		retval = driver->remove(vdev);
+
+	return retval;
+}
+
 struct bus_type vme_bus_type = {
 	.name = "vme",
 	.match = vme_bus_match,
 	.probe = vme_bus_probe,
+	.remove = vme_bus_remove,
 };
 EXPORT_SYMBOL(vme_bus_type);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/vme-restore-bus_remove-function-causing-incomplete-module-unload.patch