pcmcia: Use common pci_stop_and_remove_bus_device() (0a140577) · Commits · 戴 / test

Use pci_stop_and_remove_bus_device() like most other hotplug drivers rather than the special-purpose "behind_bridge" variant. This just means we have to iterate through all the devices downstream of the bridge ourselves, which is the same thing pci_stop_behind_bridge() did. Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com> Acked-by:

Yinghai Lu <yinghai@kernel.org>

drivers/pcmcia/cardbus.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -105,8 +105,17 @@ int __ref cb_alloc(struct pcmcia_socket *s)
		*/
		void cb_free(struct pcmcia_socket *s)
		{
		struct pci_dev *bridge = s->cb_dev;
		struct pci_dev bridge, dev, *tmp;
		struct pci_bus *bus;

		if (bridge)
		pci_stop_and_remove_behind_bridge(bridge);
		bridge = s->cb_dev;
		if (!bridge)
		return;

		bus = bridge->subordinate;
		if (!bus)
		return;

		list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list)
		pci_stop_and_remove_bus_device(dev);
		}

Admin message