TO: Jonathan DE CESCO <[email protected]> CC: Stefan Stanacar <[email protected]>
tree: ssh://[email protected]:29418/a/bsp/kernel/gmin abt/topic/gmin/l-dev/release/88 head: bb2df08cd69499bb1413227475a8b63d019fa45e commit: c5151d632a1a134bb9cffd9fd307ba760c7612a9 [389/499] bcmdhd: add ACPI probing for 43241 chip :::::: branch date: 3 weeks ago :::::: commit date: 3 weeks ago >> drivers/net/wireless/bcmdhd/dhd_linux_platdev.c:346:55-56: probe: first >> occurrence line 348, second occurrence line 350 -- >> drivers/net/wireless/bcmdhd/dhd_linux_platdev.c:547:2-85: code aligned with >> following code on line 548 >> drivers/net/wireless/bcmdhd/dhd_linux_platdev.c:412:1-86: code aligned with >> following code on line 413 >> drivers/net/wireless/bcmdhd/dhd_linux_platdev.c:474:1-86: code aligned with >> following code on line 475 git remote add internal-gmin ssh://[email protected]:29418/a/bsp/kernel/gmin git remote update internal-gmin git checkout c5151d632a1a134bb9cffd9fd307ba760c7612a9 vim +346 drivers/net/wireless/bcmdhd/dhd_linux_platdev.c c5151d63 Jonathan DE CESCO 2014-10-08 340 { "BCM4321" }, c5151d63 Jonathan DE CESCO 2014-10-08 341 { } c5151d63 Jonathan DE CESCO 2014-10-08 342 }; c5151d63 Jonathan DE CESCO 2014-10-08 343 MODULE_DEVICE_TABLE(acpi, bcm_acpi_id); c5151d63 Jonathan DE CESCO 2014-10-08 344 #endif c5151d63 Jonathan DE CESCO 2014-10-08 345 04febbbd Ecco Park 2014-01-17 @346 static struct platform_driver wifi_platform_dev_driver = { c5151d63 Jonathan DE CESCO 2014-10-08 347 #ifdef CONFIG_ACPI c5151d63 Jonathan DE CESCO 2014-10-08 @348 .probe = wifi_plat_dev_drv_probe_acpi, c5151d63 Jonathan DE CESCO 2014-10-08 349 #else 04febbbd Ecco Park 2014-01-17 @350 .probe = wifi_plat_dev_drv_probe, c5151d63 Jonathan DE CESCO 2014-10-08 351 #endif 04febbbd Ecco Park 2014-01-17 352 .remove = wifi_plat_dev_drv_remove, 04febbbd Ecco Park 2014-01-17 353 .suspend = wifi_plat_dev_drv_suspend, 04febbbd Ecco Park 2014-01-17 354 .resume = wifi_plat_dev_drv_resume, 04febbbd Ecco Park 2014-01-17 355 .driver = { c5151d63 Jonathan DE CESCO 2014-10-08 356 #ifdef CONFIG_ACPI c5151d63 Jonathan DE CESCO 2014-10-08 357 .acpi_match_table = ACPI_PTR(bcm_acpi_id), c5151d63 Jonathan DE CESCO 2014-10-08 358 #endif 04febbbd Ecco Park 2014-01-17 359 .name = WIFI_PLAT_NAME, 04febbbd Ecco Park 2014-01-17 360 } 04febbbd Ecco Park 2014-01-17 361 }; 04febbbd Ecco Park 2014-01-17 362 04febbbd Ecco Park 2014-01-17 363 static struct platform_driver wifi_platform_dev_driver_legacy = { 04febbbd Ecco Park 2014-01-17 364 .probe = wifi_plat_dev_drv_probe, 04febbbd Ecco Park 2014-01-17 365 .remove = wifi_plat_dev_drv_remove, 04febbbd Ecco Park 2014-01-17 366 .suspend = wifi_plat_dev_drv_suspend, 04febbbd Ecco Park 2014-01-17 367 .resume = wifi_plat_dev_drv_resume, 04febbbd Ecco Park 2014-01-17 368 .driver = { 04febbbd Ecco Park 2014-01-17 369 .name = WIFI_PLAT_NAME2, 04febbbd Ecco Park 2014-01-17 370 } 04febbbd Ecco Park 2014-01-17 371 }; 04febbbd Ecco Park 2014-01-17 372 c5151d63 Jonathan DE CESCO 2014-10-08 373 #ifdef CONFIG_ACPI c5151d63 Jonathan DE CESCO 2014-10-08 374 static int wifi_acpi_match(struct device *dev, void *data) c5151d63 Jonathan DE CESCO 2014-10-08 375 { c5151d63 Jonathan DE CESCO 2014-10-08 376 struct acpi_device_id *ids = data, *id; c5151d63 Jonathan DE CESCO 2014-10-08 377 struct platform_device *pdev = to_platform_device(dev); c5151d63 Jonathan DE CESCO 2014-10-08 378 c5151d63 Jonathan DE CESCO 2014-10-08 379 for (id = ids; id->id[0]; id++) { c5151d63 Jonathan DE CESCO 2014-10-08 380 if (!strncmp(id->id, pdev->name, strlen(id->id))) { c5151d63 Jonathan DE CESCO 2014-10-08 381 DHD_ERROR(("found wifi acpi device %s\n", id->id)); c5151d63 Jonathan DE CESCO 2014-10-08 382 return TRUE; c5151d63 Jonathan DE CESCO 2014-10-08 383 } c5151d63 Jonathan DE CESCO 2014-10-08 384 } c5151d63 Jonathan DE CESCO 2014-10-08 385 return FALSE; c5151d63 Jonathan DE CESCO 2014-10-08 386 } c5151d63 Jonathan DE CESCO 2014-10-08 387 #endif /* CONFIG_ACPI */ c5151d63 Jonathan DE CESCO 2014-10-08 388 04febbbd Ecco Park 2014-01-17 389 static int wifi_platdev_match(struct device *dev, void *data) 04febbbd Ecco Park 2014-01-17 390 { 04febbbd Ecco Park 2014-01-17 391 char *name = (char*)data; 04febbbd Ecco Park 2014-01-17 392 struct platform_device *pdev = to_platform_device(dev); 04febbbd Ecco Park 2014-01-17 393 04febbbd Ecco Park 2014-01-17 394 if (strcmp(pdev->name, name) == 0) { 04febbbd Ecco Park 2014-01-17 395 DHD_ERROR(("found wifi platform device %s\n", name)); 04febbbd Ecco Park 2014-01-17 396 return TRUE; 04febbbd Ecco Park 2014-01-17 397 } 04febbbd Ecco Park 2014-01-17 398 04febbbd Ecco Park 2014-01-17 399 return FALSE; 04febbbd Ecco Park 2014-01-17 400 } 04febbbd Ecco Park 2014-01-17 401 04febbbd Ecco Park 2014-01-17 402 static int wifi_ctrlfunc_register_drv(void) 04febbbd Ecco Park 2014-01-17 403 { 04febbbd Ecco Park 2014-01-17 404 int err = 0; c5151d63 Jonathan DE CESCO 2014-10-08 405 struct device *dev1, *dev2 = NULL; 04febbbd Ecco Park 2014-01-17 406 wifi_adapter_info_t *adapter; 04febbbd Ecco Park 2014-01-17 407 c5151d63 Jonathan DE CESCO 2014-10-08 408 #ifdef CONFIG_ACPI c5151d63 Jonathan DE CESCO 2014-10-08 409 dev1 = bus_find_device(&platform_bus_type, NULL, bcm_acpi_id, wifi_acpi_match); c5151d63 Jonathan DE CESCO 2014-10-08 410 if (!dev1) c5151d63 Jonathan DE CESCO 2014-10-08 411 #endif /* CONFIG_ACPI */ 04febbbd Ecco Park 2014-01-17 @412 dev1 = bus_find_device(&platform_bus_type, NULL, WIFI_PLAT_NAME, wifi_platdev_match); 04febbbd Ecco Park 2014-01-17 @413 dev2 = bus_find_device(&platform_bus_type, NULL, WIFI_PLAT_NAME2, wifi_platdev_match); 04febbbd Ecco Park 2014-01-17 414 if (!dts_enabled) { 04febbbd Ecco Park 2014-01-17 415 if (dev1 == NULL && dev2 == NULL) { 04febbbd Ecco Park 2014-01-17 416 DHD_ERROR(("no wifi platform data, skip\n")); 04febbbd Ecco Park 2014-01-17 417 return -ENXIO; 04febbbd Ecco Park 2014-01-17 418 } 04febbbd Ecco Park 2014-01-17 419 } 04febbbd Ecco Park 2014-01-17 420 04febbbd Ecco Park 2014-01-17 421 /* multi-chip support not enabled, build one adapter information for 04febbbd Ecco Park 2014-01-17 422 * DHD (either SDIO, USB or PCIe) 04febbbd Ecco Park 2014-01-17 423 */ 04febbbd Ecco Park 2014-01-17 424 adapter = kzalloc(sizeof(wifi_adapter_info_t), GFP_KERNEL); 04febbbd Ecco Park 2014-01-17 425 adapter->name = "DHD generic adapter"; 04febbbd Ecco Park 2014-01-17 426 adapter->bus_type = -1; 04febbbd Ecco Park 2014-01-17 427 adapter->bus_num = -1; 04febbbd Ecco Park 2014-01-17 428 adapter->slot_num = -1; 04febbbd Ecco Park 2014-01-17 429 adapter->irq_num = -1; 04febbbd Ecco Park 2014-01-17 430 is_power_on = FALSE; 04febbbd Ecco Park 2014-01-17 431 wifi_plat_dev_probe_ret = 0; 04febbbd Ecco Park 2014-01-17 432 dhd_wifi_platdata = kzalloc(sizeof(bcmdhd_wifi_platdata_t), GFP_KERNEL); 04febbbd Ecco Park 2014-01-17 433 dhd_wifi_platdata->num_adapters = 1; 04febbbd Ecco Park 2014-01-17 434 dhd_wifi_platdata->adapters = adapter; 04febbbd Ecco Park 2014-01-17 435 04febbbd Ecco Park 2014-01-17 436 if (dev1) { 04febbbd Ecco Park 2014-01-17 437 err = platform_driver_register(&wifi_platform_dev_driver); 04febbbd Ecco Park 2014-01-17 438 if (err) { 04febbbd Ecco Park 2014-01-17 439 DHD_ERROR(("%s: failed to register wifi ctrl func driver\n", 04febbbd Ecco Park 2014-01-17 440 __FUNCTION__)); 04febbbd Ecco Park 2014-01-17 441 return err; 04febbbd Ecco Park 2014-01-17 442 } 04febbbd Ecco Park 2014-01-17 443 } 04febbbd Ecco Park 2014-01-17 444 if (dev2) { 04febbbd Ecco Park 2014-01-17 445 err = platform_driver_register(&wifi_platform_dev_driver_legacy); 04febbbd Ecco Park 2014-01-17 446 if (err) { 04febbbd Ecco Park 2014-01-17 447 DHD_ERROR(("%s: failed to register wifi ctrl func legacy driver\n", 04febbbd Ecco Park 2014-01-17 448 __FUNCTION__)); 04febbbd Ecco Park 2014-01-17 449 return err; 04febbbd Ecco Park 2014-01-17 450 } 04febbbd Ecco Park 2014-01-17 451 } 04febbbd Ecco Park 2014-01-17 452 04febbbd Ecco Park 2014-01-17 453 if (dts_enabled) { 04febbbd Ecco Park 2014-01-17 454 struct resource *resource; 04febbbd Ecco Park 2014-01-17 455 adapter->wifi_plat_data = (void *)&dhd_wlan_control; 04febbbd Ecco Park 2014-01-17 456 resource = &dhd_wlan_resources; 04febbbd Ecco Park 2014-01-17 457 adapter->irq_num = resource->start; 04febbbd Ecco Park 2014-01-17 458 adapter->intr_flags = resource->flags & IRQF_TRIGGER_MASK; 04febbbd Ecco Park 2014-01-17 459 wifi_plat_dev_probe_ret = dhd_wifi_platform_load(); 04febbbd Ecco Park 2014-01-17 460 } 04febbbd Ecco Park 2014-01-17 461 04febbbd Ecco Park 2014-01-17 462 /* return probe function's return value if registeration succeeded */ 04febbbd Ecco Park 2014-01-17 463 return wifi_plat_dev_probe_ret; 04febbbd Ecco Park 2014-01-17 464 } 04febbbd Ecco Park 2014-01-17 465 04febbbd Ecco Park 2014-01-17 466 void wifi_ctrlfunc_unregister_drv(void) 04febbbd Ecco Park 2014-01-17 467 { c5151d63 Jonathan DE CESCO 2014-10-08 468 struct device *dev1, *dev2 = NULL; 04febbbd Ecco Park 2014-01-17 469 c5151d63 Jonathan DE CESCO 2014-10-08 470 #ifdef CONFIG_ACPI c5151d63 Jonathan DE CESCO 2014-10-08 471 dev1 = bus_find_device(&platform_bus_type, NULL, bcm_acpi_id, wifi_acpi_match); c5151d63 Jonathan DE CESCO 2014-10-08 472 if (!dev1) c5151d63 Jonathan DE CESCO 2014-10-08 473 #endif /* CONFIG_ACPI */ 04febbbd Ecco Park 2014-01-17 @474 dev1 = bus_find_device(&platform_bus_type, NULL, WIFI_PLAT_NAME, wifi_platdev_match); 04febbbd Ecco Park 2014-01-17 @475 dev2 = bus_find_device(&platform_bus_type, NULL, WIFI_PLAT_NAME2, wifi_platdev_match); 04febbbd Ecco Park 2014-01-17 476 if (!dts_enabled) 04febbbd Ecco Park 2014-01-17 477 if (dev1 == NULL && dev2 == NULL) 04febbbd Ecco Park 2014-01-17 478 return; :::::: The code at line 346 was first introduced by commit :::::: 04febbbd08be88694bac2dad68b4b3b319e87d9a net: wireless: bcmdhd: Update to Version 1.141.31 :::::: TO: Ecco Park <[email protected]> :::::: CC: Stefan Stanacar <[email protected]> --- 0-DAY kernel test infrastructure Open Source Technology Center http://lists.01.org/mailman/listinfo/kbuild Intel Corporation _______________________________________________ kbuild mailing list [email protected] https://lists.01.org/mailman/listinfo/kbuild
