1 files changed, 10 insertions, 109 deletions
diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c
index 021d0f76bc4c..3903f8c559b6 100644
--- a/drivers/pci/hotplug.c
+++ b/drivers/pci/hotplug.c
@@ -52,116 +52,17 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp,
        if ((buffer_size - length <= 0) || (i >= num_envp))
                return -ENOMEM;
+        envp[i++] = scratch;
+        length += scnprintf (scratch, buffer_size - length,
+                            "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x\n",
+                            pdev->vendor, pdev->device,
+                            pdev->subsystem_vendor, pdev->subsystem_device,
+                            (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
+                            (u8)(pdev->class));
+        if ((buffer_size - length <= 0) || (i >= num_envp))
+                return -ENOMEM;
        envp[i] = NULL;
        return 0;
 }
-static int pci_visit_bus (struct pci_visit * fn, struct pci_bus_wrapped *wrapped_bus, struct pci_dev_wrapped *wrapped_parent)
-{
-        struct list_head *ln;
-        struct pci_dev *dev;
-        struct pci_dev_wrapped wrapped_dev;
-        int result = 0;
-        pr_debug("PCI: Scanning bus %04x:%02x\n", pci_domain_nr(wrapped_bus->bus),
-                wrapped_bus->bus->number);
-        if (fn->pre_visit_pci_bus) {
-                result = fn->pre_visit_pci_bus(wrapped_bus, wrapped_parent);
-                if (result)
-                        return result;
-        }
-        ln = wrapped_bus->bus->devices.next; 
-        while (ln != &wrapped_bus->bus->devices) {
-                dev = pci_dev_b(ln);
-                ln = ln->next;
-                memset(&wrapped_dev, 0, sizeof(struct pci_dev_wrapped));
-                wrapped_dev.dev = dev;
-                result = pci_visit_dev(fn, &wrapped_dev, wrapped_bus);
-                if (result)
-                        return result;
-        }
-        if (fn->post_visit_pci_bus)
-                result = fn->post_visit_pci_bus(wrapped_bus, wrapped_parent);
-        return result;
-}
-static int pci_visit_bridge (struct pci_visit * fn,
-                             struct pci_dev_wrapped *wrapped_dev,
-                             struct pci_bus_wrapped *wrapped_parent)
-{
-        struct pci_bus *bus;
-        struct pci_bus_wrapped wrapped_bus;
-        int result = 0;
-        pr_debug("PCI: Scanning bridge %s\n", pci_name(wrapped_dev->dev));
-        if (fn->visit_pci_dev) {
-                result = fn->visit_pci_dev(wrapped_dev, wrapped_parent);
-                if (result)
-                        return result;
-        }
-        bus = wrapped_dev->dev->subordinate;
-        if (bus) {
-                memset(&wrapped_bus, 0, sizeof(struct pci_bus_wrapped));
-                wrapped_bus.bus = bus;
-                result = pci_visit_bus(fn, &wrapped_bus, wrapped_dev);
-        }
-        return result;
-}
-/**
- * pci_visit_dev - scans the pci buses.
- * @fn: callback functions that are called while visiting
- * @wrapped_dev: the device to scan
- * @wrapped_parent: the bus where @wrapped_dev is connected to
- *
- * Every bus and every function is presented to a custom
- * function that can act upon it.
- */
-int pci_visit_dev(struct pci_visit *fn, struct pci_dev_wrapped *wrapped_dev,
-                  struct pci_bus_wrapped *wrapped_parent)
-{
-        struct pci_dev* dev = wrapped_dev ? wrapped_dev->dev : NULL;
-        int result = 0;
-        if (!dev)
-                return 0;
-        if (fn->pre_visit_pci_dev) {
-                result = fn->pre_visit_pci_dev(wrapped_dev, wrapped_parent);
-                if (result)
-                        return result;
-        }
-        switch (dev->class >> 8) {
-                case PCI_CLASS_BRIDGE_PCI:
-                        result = pci_visit_bridge(fn, wrapped_dev,
-                                                  wrapped_parent);
-                        if (result)
-                                return result;
-                        break;
-                default:
-                        pr_debug("PCI: Scanning device %s\n", pci_name(dev));
-                        if (fn->visit_pci_dev) {
-                                result = fn->visit_pci_dev (wrapped_dev,
-                                                            wrapped_parent);
-                                if (result)
-                                        return result;
-                        }
-        }
-        if (fn->post_visit_pci_dev)
-                result = fn->post_visit_pci_dev(wrapped_dev, wrapped_parent);
-        return result;
-}
-EXPORT_SYMBOL(pci_visit_dev);

diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c index 021d0f76bc4c..3903f8c559b6 100644 --- a/drivers/pci/hotplug.c +++ b/drivers/pci/hotplug.c
@@ -52,116 +52,17 @@ int pci_hotplug (struct device dev, char *envp, int num_envp,
52	if ((buffer_size - length <= 0) \|\| (i >= num_envp))	52	if ((buffer_size - length <= 0) \|\| (i >= num_envp))
53	return -ENOMEM;	53	return -ENOMEM;
54		54
		55	envp[i++] = scratch;
		56	length += scnprintf (scratch, buffer_size - length,
		57	"MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x\n",
		58	pdev->vendor, pdev->device,
		59	pdev->subsystem_vendor, pdev->subsystem_device,
		60	(u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
		61	(u8)(pdev->class));
		62	if ((buffer_size - length <= 0) \|\| (i >= num_envp))
		63	return -ENOMEM;
		64
55	envp[i] = NULL;	65	envp[i] = NULL;
56		66
57	return 0;	67	return 0;
58	}	68	}
59
60	static int pci_visit_bus (struct pci_visit * fn, struct pci_bus_wrapped wrapped_bus, struct pci_dev_wrapped wrapped_parent)
61	{
62	struct list_head *ln;
63	struct pci_dev *dev;
64	struct pci_dev_wrapped wrapped_dev;
65	int result = 0;
66
67	pr_debug("PCI: Scanning bus %04x:%02x\n", pci_domain_nr(wrapped_bus->bus),
68	wrapped_bus->bus->number);
69
70	if (fn->pre_visit_pci_bus) {
71	result = fn->pre_visit_pci_bus(wrapped_bus, wrapped_parent);
72	if (result)
73	return result;
74	}
75
76	ln = wrapped_bus->bus->devices.next;
77	while (ln != &wrapped_bus->bus->devices) {
78	dev = pci_dev_b(ln);
79	ln = ln->next;
80
81	memset(&wrapped_dev, 0, sizeof(struct pci_dev_wrapped));
82	wrapped_dev.dev = dev;
83
84	result = pci_visit_dev(fn, &wrapped_dev, wrapped_bus);
85	if (result)
86	return result;
87	}
88
89	if (fn->post_visit_pci_bus)
90	result = fn->post_visit_pci_bus(wrapped_bus, wrapped_parent);
91
92	return result;
93	}
94
95	static int pci_visit_bridge (struct pci_visit * fn,
96	struct pci_dev_wrapped *wrapped_dev,
97	struct pci_bus_wrapped *wrapped_parent)
98	{
99	struct pci_bus *bus;
100	struct pci_bus_wrapped wrapped_bus;
101	int result = 0;
102
103	pr_debug("PCI: Scanning bridge %s\n", pci_name(wrapped_dev->dev));
104
105	if (fn->visit_pci_dev) {
106	result = fn->visit_pci_dev(wrapped_dev, wrapped_parent);
107	if (result)
108	return result;
109	}
110
111	bus = wrapped_dev->dev->subordinate;
112	if (bus) {
113	memset(&wrapped_bus, 0, sizeof(struct pci_bus_wrapped));
114	wrapped_bus.bus = bus;
115
116	result = pci_visit_bus(fn, &wrapped_bus, wrapped_dev);
117	}
118	return result;
119	}
120
121	/**
122	* pci_visit_dev - scans the pci buses.
123	* @fn: callback functions that are called while visiting
124	* @wrapped_dev: the device to scan
125	* @wrapped_parent: the bus where @wrapped_dev is connected to
126	*
127	* Every bus and every function is presented to a custom
128	* function that can act upon it.
129	*/
130	int pci_visit_dev(struct pci_visit fn, struct pci_dev_wrapped wrapped_dev,
131	struct pci_bus_wrapped *wrapped_parent)
132	{
133	struct pci_dev* dev = wrapped_dev ? wrapped_dev->dev : NULL;
134	int result = 0;
135
136	if (!dev)
137	return 0;
138
139	if (fn->pre_visit_pci_dev) {
140	result = fn->pre_visit_pci_dev(wrapped_dev, wrapped_parent);
141	if (result)
142	return result;
143	}
144
145	switch (dev->class >> 8) {
146	case PCI_CLASS_BRIDGE_PCI:
147	result = pci_visit_bridge(fn, wrapped_dev,
148	wrapped_parent);
149	if (result)
150	return result;
151	break;
152	default:
153	pr_debug("PCI: Scanning device %s\n", pci_name(dev));
154	if (fn->visit_pci_dev) {
155	result = fn->visit_pci_dev (wrapped_dev,
156	wrapped_parent);
157	if (result)
158	return result;
159	}
160	}
161
162	if (fn->post_visit_pci_dev)
163	result = fn->post_visit_pci_dev(wrapped_dev, wrapped_parent);
164
165	return result;
166	}
167	EXPORT_SYMBOL(pci_visit_dev);