Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1fffa905adffbf0d3767fc978ef09afb830275eb

Authored by Piotr Haber
Committed by John W. Linville
1 parent d4fa14cd62
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

bcma: fix unregistration of cores 

When cores are unregistered, entries
need to be removed from cores list in a safe manner.

Reported-by: Stanislaw Gruszka <sgruszka@redhat.com>
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Signed-off-by: Piotr Haber <phaber@broadcom.com>
Cc: stable@vger.kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 3 additions and 2 deletions Inline Diff

1 /* 1 /*
2 * Broadcom specific AMBA 2 * Broadcom specific AMBA
3 * Bus subsystem 3 * Bus subsystem
4 * 4 *
5 * Licensed under the GNU/GPL. See COPYING for details. 5 * Licensed under the GNU/GPL. See COPYING for details.
6 */ 6 */
7 7
8 #include "bcma_private.h" 8 #include "bcma_private.h"
9 #include <linux/module.h> 9 #include <linux/module.h>
10 #include <linux/platform_device.h> 10 #include <linux/platform_device.h>
11 #include <linux/bcma/bcma.h> 11 #include <linux/bcma/bcma.h>
12 #include <linux/slab.h> 12 #include <linux/slab.h>
13 13
14 MODULE_DESCRIPTION("Broadcom's specific AMBA driver"); 14 MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
15 MODULE_LICENSE("GPL"); 15 MODULE_LICENSE("GPL");
16 16
17 /* contains the number the next bus should get. */ 17 /* contains the number the next bus should get. */
18 static unsigned int bcma_bus_next_num = 0; 18 static unsigned int bcma_bus_next_num = 0;
19 19
20 /* bcma_buses_mutex locks the bcma_bus_next_num */ 20 /* bcma_buses_mutex locks the bcma_bus_next_num */
21 static DEFINE_MUTEX(bcma_buses_mutex); 21 static DEFINE_MUTEX(bcma_buses_mutex);
22 22
23 static int bcma_bus_match(struct device *dev, struct device_driver *drv); 23 static int bcma_bus_match(struct device *dev, struct device_driver *drv);
24 static int bcma_device_probe(struct device *dev); 24 static int bcma_device_probe(struct device *dev);
25 static int bcma_device_remove(struct device *dev); 25 static int bcma_device_remove(struct device *dev);
26 static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env); 26 static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env);
27 27
28 static ssize_t manuf_show(struct device *dev, struct device_attribute *attr, char *buf) 28 static ssize_t manuf_show(struct device *dev, struct device_attribute *attr, char *buf)
29 { 29 {
30 struct bcma_device *core = container_of(dev, struct bcma_device, dev); 30 struct bcma_device *core = container_of(dev, struct bcma_device, dev);
31 return sprintf(buf, "0x%03X\n", core->id.manuf); 31 return sprintf(buf, "0x%03X\n", core->id.manuf);
32 } 32 }
33 static ssize_t id_show(struct device *dev, struct device_attribute *attr, char *buf) 33 static ssize_t id_show(struct device *dev, struct device_attribute *attr, char *buf)
34 { 34 {
35 struct bcma_device *core = container_of(dev, struct bcma_device, dev); 35 struct bcma_device *core = container_of(dev, struct bcma_device, dev);
36 return sprintf(buf, "0x%03X\n", core->id.id); 36 return sprintf(buf, "0x%03X\n", core->id.id);
37 } 37 }
38 static ssize_t rev_show(struct device *dev, struct device_attribute *attr, char *buf) 38 static ssize_t rev_show(struct device *dev, struct device_attribute *attr, char *buf)
39 { 39 {
40 struct bcma_device *core = container_of(dev, struct bcma_device, dev); 40 struct bcma_device *core = container_of(dev, struct bcma_device, dev);
41 return sprintf(buf, "0x%02X\n", core->id.rev); 41 return sprintf(buf, "0x%02X\n", core->id.rev);
42 } 42 }
43 static ssize_t class_show(struct device *dev, struct device_attribute *attr, char *buf) 43 static ssize_t class_show(struct device *dev, struct device_attribute *attr, char *buf)
44 { 44 {
45 struct bcma_device *core = container_of(dev, struct bcma_device, dev); 45 struct bcma_device *core = container_of(dev, struct bcma_device, dev);
46 return sprintf(buf, "0x%X\n", core->id.class); 46 return sprintf(buf, "0x%X\n", core->id.class);
47 } 47 }
48 static struct device_attribute bcma_device_attrs[] = { 48 static struct device_attribute bcma_device_attrs[] = {
49 __ATTR_RO(manuf), 49 __ATTR_RO(manuf),
50 __ATTR_RO(id), 50 __ATTR_RO(id),
51 __ATTR_RO(rev), 51 __ATTR_RO(rev),
52 __ATTR_RO(class), 52 __ATTR_RO(class),
53 __ATTR_NULL, 53 __ATTR_NULL,
54 }; 54 };
55 55
56 static struct bus_type bcma_bus_type = { 56 static struct bus_type bcma_bus_type = {
57 .name = "bcma", 57 .name = "bcma",
58 .match = bcma_bus_match, 58 .match = bcma_bus_match,
59 .probe = bcma_device_probe, 59 .probe = bcma_device_probe,
60 .remove = bcma_device_remove, 60 .remove = bcma_device_remove,
61 .uevent = bcma_device_uevent, 61 .uevent = bcma_device_uevent,
62 .dev_attrs = bcma_device_attrs, 62 .dev_attrs = bcma_device_attrs,
63 }; 63 };
64 64
65 static u16 bcma_cc_core_id(struct bcma_bus *bus) 65 static u16 bcma_cc_core_id(struct bcma_bus *bus)
66 { 66 {
67 if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) 67 if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)
68 return BCMA_CORE_4706_CHIPCOMMON; 68 return BCMA_CORE_4706_CHIPCOMMON;
69 return BCMA_CORE_CHIPCOMMON; 69 return BCMA_CORE_CHIPCOMMON;
70 } 70 }
71 71
72 struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid) 72 struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
73 { 73 {
74 struct bcma_device *core; 74 struct bcma_device *core;
75 75
76 list_for_each_entry(core, &bus->cores, list) { 76 list_for_each_entry(core, &bus->cores, list) {
77 if (core->id.id == coreid) 77 if (core->id.id == coreid)
78 return core; 78 return core;
79 } 79 }
80 return NULL; 80 return NULL;
81 } 81 }
82 EXPORT_SYMBOL_GPL(bcma_find_core); 82 EXPORT_SYMBOL_GPL(bcma_find_core);
83 83
84 static void bcma_release_core_dev(struct device *dev) 84 static void bcma_release_core_dev(struct device *dev)
85 { 85 {
86 struct bcma_device *core = container_of(dev, struct bcma_device, dev); 86 struct bcma_device *core = container_of(dev, struct bcma_device, dev);
87 if (core->io_addr) 87 if (core->io_addr)
88 iounmap(core->io_addr); 88 iounmap(core->io_addr);
89 if (core->io_wrap) 89 if (core->io_wrap)
90 iounmap(core->io_wrap); 90 iounmap(core->io_wrap);
91 kfree(core); 91 kfree(core);
92 } 92 }
93 93
94 static int bcma_register_cores(struct bcma_bus *bus) 94 static int bcma_register_cores(struct bcma_bus *bus)
95 { 95 {
96 struct bcma_device *core; 96 struct bcma_device *core;
97 int err, dev_id = 0; 97 int err, dev_id = 0;
98 98
99 list_for_each_entry(core, &bus->cores, list) { 99 list_for_each_entry(core, &bus->cores, list) {
100 /* We support that cores ourself */ 100 /* We support that cores ourself */
101 switch (core->id.id) { 101 switch (core->id.id) {
102 case BCMA_CORE_4706_CHIPCOMMON: 102 case BCMA_CORE_4706_CHIPCOMMON:
103 case BCMA_CORE_CHIPCOMMON: 103 case BCMA_CORE_CHIPCOMMON:
104 case BCMA_CORE_PCI: 104 case BCMA_CORE_PCI:
105 case BCMA_CORE_PCIE: 105 case BCMA_CORE_PCIE:
106 case BCMA_CORE_MIPS_74K: 106 case BCMA_CORE_MIPS_74K:
107 case BCMA_CORE_4706_MAC_GBIT_COMMON: 107 case BCMA_CORE_4706_MAC_GBIT_COMMON:
108 continue; 108 continue;
109 } 109 }
110 110
111 core->dev.release = bcma_release_core_dev; 111 core->dev.release = bcma_release_core_dev;
112 core->dev.bus = &bcma_bus_type; 112 core->dev.bus = &bcma_bus_type;
113 dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id); 113 dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
114 114
115 switch (bus->hosttype) { 115 switch (bus->hosttype) {
116 case BCMA_HOSTTYPE_PCI: 116 case BCMA_HOSTTYPE_PCI:
117 core->dev.parent = &bus->host_pci->dev; 117 core->dev.parent = &bus->host_pci->dev;
118 core->dma_dev = &bus->host_pci->dev; 118 core->dma_dev = &bus->host_pci->dev;
119 core->irq = bus->host_pci->irq; 119 core->irq = bus->host_pci->irq;
120 break; 120 break;
121 case BCMA_HOSTTYPE_SOC: 121 case BCMA_HOSTTYPE_SOC:
122 core->dev.dma_mask = &core->dev.coherent_dma_mask; 122 core->dev.dma_mask = &core->dev.coherent_dma_mask;
123 core->dma_dev = &core->dev; 123 core->dma_dev = &core->dev;
124 break; 124 break;
125 case BCMA_HOSTTYPE_SDIO: 125 case BCMA_HOSTTYPE_SDIO:
126 break; 126 break;
127 } 127 }
128 128
129 err = device_register(&core->dev); 129 err = device_register(&core->dev);
130 if (err) { 130 if (err) {
131 bcma_err(bus, 131 bcma_err(bus,
132 "Could not register dev for core 0x%03X\n", 132 "Could not register dev for core 0x%03X\n",
133 core->id.id); 133 core->id.id);
134 continue; 134 continue;
135 } 135 }
136 core->dev_registered = true; 136 core->dev_registered = true;
137 dev_id++; 137 dev_id++;
138 } 138 }
139 139
140 #ifdef CONFIG_BCMA_SFLASH 140 #ifdef CONFIG_BCMA_SFLASH
141 if (bus->drv_cc.sflash.present) { 141 if (bus->drv_cc.sflash.present) {
142 err = platform_device_register(&bcma_sflash_dev); 142 err = platform_device_register(&bcma_sflash_dev);
143 if (err) 143 if (err)
144 bcma_err(bus, "Error registering serial flash\n"); 144 bcma_err(bus, "Error registering serial flash\n");
145 } 145 }
146 #endif 146 #endif
147 147
148 #ifdef CONFIG_BCMA_NFLASH 148 #ifdef CONFIG_BCMA_NFLASH
149 if (bus->drv_cc.nflash.present) { 149 if (bus->drv_cc.nflash.present) {
150 err = platform_device_register(&bcma_nflash_dev); 150 err = platform_device_register(&bcma_nflash_dev);
151 if (err) 151 if (err)
152 bcma_err(bus, "Error registering NAND flash\n"); 152 bcma_err(bus, "Error registering NAND flash\n");
153 } 153 }
154 #endif 154 #endif
155 155
156 return 0; 156 return 0;
157 } 157 }
158 158
159 static void bcma_unregister_cores(struct bcma_bus *bus) 159 static void bcma_unregister_cores(struct bcma_bus *bus)
160 { 160 {
161 struct bcma_device *core; 161 struct bcma_device *core, *tmp;
162 162
163 list_for_each_entry(core, &bus->cores, list) { 163 list_for_each_entry_safe(core, tmp, &bus->cores, list) {
164 list_del(&core->list);
164 if (core->dev_registered) 165 if (core->dev_registered)
165 device_unregister(&core->dev); 166 device_unregister(&core->dev);
166 } 167 }
167 } 168 }
168 169
169 int __devinit bcma_bus_register(struct bcma_bus *bus) 170 int __devinit bcma_bus_register(struct bcma_bus *bus)
170 { 171 {
171 int err; 172 int err;
172 struct bcma_device *core; 173 struct bcma_device *core;
173 174
174 mutex_lock(&bcma_buses_mutex); 175 mutex_lock(&bcma_buses_mutex);
175 bus->num = bcma_bus_next_num++; 176 bus->num = bcma_bus_next_num++;
176 mutex_unlock(&bcma_buses_mutex); 177 mutex_unlock(&bcma_buses_mutex);
177 178
178 /* Scan for devices (cores) */ 179 /* Scan for devices (cores) */
179 err = bcma_bus_scan(bus); 180 err = bcma_bus_scan(bus);
180 if (err) { 181 if (err) {
181 bcma_err(bus, "Failed to scan: %d\n", err); 182 bcma_err(bus, "Failed to scan: %d\n", err);
182 return -1; 183 return -1;
183 } 184 }
184 185
185 /* Init CC core */ 186 /* Init CC core */
186 core = bcma_find_core(bus, bcma_cc_core_id(bus)); 187 core = bcma_find_core(bus, bcma_cc_core_id(bus));
187 if (core) { 188 if (core) {
188 bus->drv_cc.core = core; 189 bus->drv_cc.core = core;
189 bcma_core_chipcommon_init(&bus->drv_cc); 190 bcma_core_chipcommon_init(&bus->drv_cc);
190 } 191 }
191 192
192 /* Init MIPS core */ 193 /* Init MIPS core */
193 core = bcma_find_core(bus, BCMA_CORE_MIPS_74K); 194 core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
194 if (core) { 195 if (core) {
195 bus->drv_mips.core = core; 196 bus->drv_mips.core = core;
196 bcma_core_mips_init(&bus->drv_mips); 197 bcma_core_mips_init(&bus->drv_mips);
197 } 198 }
198 199
199 /* Init PCIE core */ 200 /* Init PCIE core */
200 core = bcma_find_core(bus, BCMA_CORE_PCIE); 201 core = bcma_find_core(bus, BCMA_CORE_PCIE);
201 if (core) { 202 if (core) {
202 bus->drv_pci.core = core; 203 bus->drv_pci.core = core;
203 bcma_core_pci_init(&bus->drv_pci); 204 bcma_core_pci_init(&bus->drv_pci);
204 } 205 }
205 206
206 /* Init GBIT MAC COMMON core */ 207 /* Init GBIT MAC COMMON core */
207 core = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON); 208 core = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
208 if (core) { 209 if (core) {
209 bus->drv_gmac_cmn.core = core; 210 bus->drv_gmac_cmn.core = core;
210 bcma_core_gmac_cmn_init(&bus->drv_gmac_cmn); 211 bcma_core_gmac_cmn_init(&bus->drv_gmac_cmn);
211 } 212 }
212 213
213 /* Try to get SPROM */ 214 /* Try to get SPROM */
214 err = bcma_sprom_get(bus); 215 err = bcma_sprom_get(bus);
215 if (err == -ENOENT) { 216 if (err == -ENOENT) {
216 bcma_err(bus, "No SPROM available\n"); 217 bcma_err(bus, "No SPROM available\n");
217 } else if (err) 218 } else if (err)
218 bcma_err(bus, "Failed to get SPROM: %d\n", err); 219 bcma_err(bus, "Failed to get SPROM: %d\n", err);
219 220
220 /* Register found cores */ 221 /* Register found cores */
221 bcma_register_cores(bus); 222 bcma_register_cores(bus);
222 223
223 bcma_info(bus, "Bus registered\n"); 224 bcma_info(bus, "Bus registered\n");
224 225
225 return 0; 226 return 0;
226 } 227 }
227 228
228 void bcma_bus_unregister(struct bcma_bus *bus) 229 void bcma_bus_unregister(struct bcma_bus *bus)
229 { 230 {
230 struct bcma_device *cores[3]; 231 struct bcma_device *cores[3];
231 232
232 cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K); 233 cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
233 cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE); 234 cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);
234 cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON); 235 cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
235 236
236 bcma_unregister_cores(bus); 237 bcma_unregister_cores(bus);
237 238
238 kfree(cores[2]); 239 kfree(cores[2]);
239 kfree(cores[1]); 240 kfree(cores[1]);
240 kfree(cores[0]); 241 kfree(cores[0]);
241 } 242 }
242 243
243 int __init bcma_bus_early_register(struct bcma_bus *bus, 244 int __init bcma_bus_early_register(struct bcma_bus *bus,
244 struct bcma_device *core_cc, 245 struct bcma_device *core_cc,
245 struct bcma_device *core_mips) 246 struct bcma_device *core_mips)
246 { 247 {
247 int err; 248 int err;
248 struct bcma_device *core; 249 struct bcma_device *core;
249 struct bcma_device_id match; 250 struct bcma_device_id match;
250 251
251 bcma_init_bus(bus); 252 bcma_init_bus(bus);
252 253
253 match.manuf = BCMA_MANUF_BCM; 254 match.manuf = BCMA_MANUF_BCM;
254 match.id = bcma_cc_core_id(bus); 255 match.id = bcma_cc_core_id(bus);
255 match.class = BCMA_CL_SIM; 256 match.class = BCMA_CL_SIM;
256 match.rev = BCMA_ANY_REV; 257 match.rev = BCMA_ANY_REV;
257 258
258 /* Scan for chip common core */ 259 /* Scan for chip common core */
259 err = bcma_bus_scan_early(bus, &match, core_cc); 260 err = bcma_bus_scan_early(bus, &match, core_cc);
260 if (err) { 261 if (err) {
261 bcma_err(bus, "Failed to scan for common core: %d\n", err); 262 bcma_err(bus, "Failed to scan for common core: %d\n", err);
262 return -1; 263 return -1;
263 } 264 }
264 265
265 match.manuf = BCMA_MANUF_MIPS; 266 match.manuf = BCMA_MANUF_MIPS;
266 match.id = BCMA_CORE_MIPS_74K; 267 match.id = BCMA_CORE_MIPS_74K;
267 match.class = BCMA_CL_SIM; 268 match.class = BCMA_CL_SIM;
268 match.rev = BCMA_ANY_REV; 269 match.rev = BCMA_ANY_REV;
269 270
270 /* Scan for mips core */ 271 /* Scan for mips core */
271 err = bcma_bus_scan_early(bus, &match, core_mips); 272 err = bcma_bus_scan_early(bus, &match, core_mips);
272 if (err) { 273 if (err) {
273 bcma_err(bus, "Failed to scan for mips core: %d\n", err); 274 bcma_err(bus, "Failed to scan for mips core: %d\n", err);
274 return -1; 275 return -1;
275 } 276 }
276 277
277 /* Init CC core */ 278 /* Init CC core */
278 core = bcma_find_core(bus, bcma_cc_core_id(bus)); 279 core = bcma_find_core(bus, bcma_cc_core_id(bus));
279 if (core) { 280 if (core) {
280 bus->drv_cc.core = core; 281 bus->drv_cc.core = core;
281 bcma_core_chipcommon_init(&bus->drv_cc); 282 bcma_core_chipcommon_init(&bus->drv_cc);
282 } 283 }
283 284
284 /* Init MIPS core */ 285 /* Init MIPS core */
285 core = bcma_find_core(bus, BCMA_CORE_MIPS_74K); 286 core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
286 if (core) { 287 if (core) {
287 bus->drv_mips.core = core; 288 bus->drv_mips.core = core;
288 bcma_core_mips_init(&bus->drv_mips); 289 bcma_core_mips_init(&bus->drv_mips);
289 } 290 }
290 291
291 bcma_info(bus, "Early bus registered\n"); 292 bcma_info(bus, "Early bus registered\n");
292 293
293 return 0; 294 return 0;
294 } 295 }
295 296
296 #ifdef CONFIG_PM 297 #ifdef CONFIG_PM
297 int bcma_bus_suspend(struct bcma_bus *bus) 298 int bcma_bus_suspend(struct bcma_bus *bus)
298 { 299 {
299 struct bcma_device *core; 300 struct bcma_device *core;
300 301
301 list_for_each_entry(core, &bus->cores, list) { 302 list_for_each_entry(core, &bus->cores, list) {
302 struct device_driver *drv = core->dev.driver; 303 struct device_driver *drv = core->dev.driver;
303 if (drv) { 304 if (drv) {
304 struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv); 305 struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv);
305 if (adrv->suspend) 306 if (adrv->suspend)
306 adrv->suspend(core); 307 adrv->suspend(core);
307 } 308 }
308 } 309 }
309 return 0; 310 return 0;
310 } 311 }
311 312
312 int bcma_bus_resume(struct bcma_bus *bus) 313 int bcma_bus_resume(struct bcma_bus *bus)
313 { 314 {
314 struct bcma_device *core; 315 struct bcma_device *core;
315 316
316 /* Init CC core */ 317 /* Init CC core */
317 if (bus->drv_cc.core) { 318 if (bus->drv_cc.core) {
318 bus->drv_cc.setup_done = false; 319 bus->drv_cc.setup_done = false;
319 bcma_core_chipcommon_init(&bus->drv_cc); 320 bcma_core_chipcommon_init(&bus->drv_cc);
320 } 321 }
321 322
322 list_for_each_entry(core, &bus->cores, list) { 323 list_for_each_entry(core, &bus->cores, list) {
323 struct device_driver *drv = core->dev.driver; 324 struct device_driver *drv = core->dev.driver;
324 if (drv) { 325 if (drv) {
325 struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv); 326 struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv);
326 if (adrv->resume) 327 if (adrv->resume)
327 adrv->resume(core); 328 adrv->resume(core);
328 } 329 }
329 } 330 }
330 331
331 return 0; 332 return 0;
332 } 333 }
333 #endif 334 #endif
334 335
335 int __bcma_driver_register(struct bcma_driver *drv, struct module *owner) 336 int __bcma_driver_register(struct bcma_driver *drv, struct module *owner)
336 { 337 {
337 drv->drv.name = drv->name; 338 drv->drv.name = drv->name;
338 drv->drv.bus = &bcma_bus_type; 339 drv->drv.bus = &bcma_bus_type;
339 drv->drv.owner = owner; 340 drv->drv.owner = owner;
340 341
341 return driver_register(&drv->drv); 342 return driver_register(&drv->drv);
342 } 343 }
343 EXPORT_SYMBOL_GPL(__bcma_driver_register); 344 EXPORT_SYMBOL_GPL(__bcma_driver_register);
344 345
345 void bcma_driver_unregister(struct bcma_driver *drv) 346 void bcma_driver_unregister(struct bcma_driver *drv)
346 { 347 {
347 driver_unregister(&drv->drv); 348 driver_unregister(&drv->drv);
348 } 349 }
349 EXPORT_SYMBOL_GPL(bcma_driver_unregister); 350 EXPORT_SYMBOL_GPL(bcma_driver_unregister);
350 351
351 static int bcma_bus_match(struct device *dev, struct device_driver *drv) 352 static int bcma_bus_match(struct device *dev, struct device_driver *drv)
352 { 353 {
353 struct bcma_device *core = container_of(dev, struct bcma_device, dev); 354 struct bcma_device *core = container_of(dev, struct bcma_device, dev);
354 struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv); 355 struct bcma_driver *adrv = container_of(drv, struct bcma_driver, drv);
355 const struct bcma_device_id *cid = &core->id; 356 const struct bcma_device_id *cid = &core->id;
356 const struct bcma_device_id *did; 357 const struct bcma_device_id *did;
357 358
358 for (did = adrv->id_table; did->manuf || did->id || did->rev; did++) { 359 for (did = adrv->id_table; did->manuf || did->id || did->rev; did++) {
359 if ((did->manuf == cid->manuf || did->manuf == BCMA_ANY_MANUF) && 360 if ((did->manuf == cid->manuf || did->manuf == BCMA_ANY_MANUF) &&
360 (did->id == cid->id || did->id == BCMA_ANY_ID) && 361 (did->id == cid->id || did->id == BCMA_ANY_ID) &&
361 (did->rev == cid->rev || did->rev == BCMA_ANY_REV) && 362 (did->rev == cid->rev || did->rev == BCMA_ANY_REV) &&
362 (did->class == cid->class || did->class == BCMA_ANY_CLASS)) 363 (did->class == cid->class || did->class == BCMA_ANY_CLASS))
363 return 1; 364 return 1;
364 } 365 }
365 return 0; 366 return 0;
366 } 367 }
367 368
368 static int bcma_device_probe(struct device *dev) 369 static int bcma_device_probe(struct device *dev)
369 { 370 {
370 struct bcma_device *core = container_of(dev, struct bcma_device, dev); 371 struct bcma_device *core = container_of(dev, struct bcma_device, dev);
371 struct bcma_driver *adrv = container_of(dev->driver, struct bcma_driver, 372 struct bcma_driver *adrv = container_of(dev->driver, struct bcma_driver,
372 drv); 373 drv);
373 int err = 0; 374 int err = 0;
374 375
375 if (adrv->probe) 376 if (adrv->probe)
376 err = adrv->probe(core); 377 err = adrv->probe(core);
377 378
378 return err; 379 return err;
379 } 380 }
380 381
381 static int bcma_device_remove(struct device *dev) 382 static int bcma_device_remove(struct device *dev)
382 { 383 {
383 struct bcma_device *core = container_of(dev, struct bcma_device, dev); 384 struct bcma_device *core = container_of(dev, struct bcma_device, dev);
384 struct bcma_driver *adrv = container_of(dev->driver, struct bcma_driver, 385 struct bcma_driver *adrv = container_of(dev->driver, struct bcma_driver,
385 drv); 386 drv);
386 387
387 if (adrv->remove) 388 if (adrv->remove)
388 adrv->remove(core); 389 adrv->remove(core);
389 390
390 return 0; 391 return 0;
391 } 392 }
392 393
393 static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env) 394 static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env)
394 { 395 {
395 struct bcma_device *core = container_of(dev, struct bcma_device, dev); 396 struct bcma_device *core = container_of(dev, struct bcma_device, dev);
396 397
397 return add_uevent_var(env, 398 return add_uevent_var(env,
398 "MODALIAS=bcma:m%04Xid%04Xrev%02Xcl%02X", 399 "MODALIAS=bcma:m%04Xid%04Xrev%02Xcl%02X",
399 core->id.manuf, core->id.id, 400 core->id.manuf, core->id.id,
400 core->id.rev, core->id.class); 401 core->id.rev, core->id.class);
401 } 402 }
402 403
403 static int __init bcma_modinit(void) 404 static int __init bcma_modinit(void)
404 { 405 {
405 int err; 406 int err;
406 407
407 err = bus_register(&bcma_bus_type); 408 err = bus_register(&bcma_bus_type);
408 if (err) 409 if (err)
409 return err; 410 return err;
410 411
411 #ifdef CONFIG_BCMA_HOST_PCI 412 #ifdef CONFIG_BCMA_HOST_PCI
412 err = bcma_host_pci_init(); 413 err = bcma_host_pci_init();
413 if (err) { 414 if (err) {
414 pr_err("PCI host initialization failed\n"); 415 pr_err("PCI host initialization failed\n");
415 err = 0; 416 err = 0;
416 } 417 }
417 #endif 418 #endif
418 419
419 return err; 420 return err;
420 } 421 }
421 fs_initcall(bcma_modinit); 422 fs_initcall(bcma_modinit);
422 423
423 static void __exit bcma_modexit(void) 424 static void __exit bcma_modexit(void)
424 { 425 {
425 #ifdef CONFIG_BCMA_HOST_PCI 426 #ifdef CONFIG_BCMA_HOST_PCI
426 bcma_host_pci_exit(); 427 bcma_host_pci_exit();
427 #endif 428 #endif
428 bus_unregister(&bcma_bus_type); 429 bus_unregister(&bcma_bus_type);
429 } 430 }
430 module_exit(bcma_modexit) 431 module_exit(bcma_modexit)
431 432