tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

extcon: Use the extcon_set_state_sync() instead of deprecated functions

This patch alters the renamed extcon API to set the state of the external
connectors instead of deprecated extcon_set_cable_state_().

Because the patch[1] modifies the function name to maintain the function
naming pattern.
- extcon_set_cable_state_() -> extcon_set_state_sync()
- extcon_get_cable_state_() -> extcon_get_state()

[1] https://lkml.org/lkml/2016/8/4/729
- extcon: Rename the extcon_set/get_state() to maintain the function naming pattern

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Roger Quadros <rogerq@ti.com>

Chanwoo Choi 8670b459 525867db

+83 -83
+2 -2
drivers/extcon/extcon-adc-jack.c
··· 75 75 for (i = 0; i < data->num_conditions; i++) { 76 76 def = &data->adc_conditions[i]; 77 77 if (def->min_adc <= adc_val && def->max_adc >= adc_val) { 78 - extcon_set_cable_state_(data->edev, def->id, true); 78 + extcon_set_state_sync(data->edev, def->id, true); 79 79 return; 80 80 } 81 81 } ··· 83 83 /* Set the detached state if adc value is not included in the range */ 84 84 for (i = 0; i < data->num_conditions; i++) { 85 85 def = &data->adc_conditions[i]; 86 - extcon_set_cable_state_(data->edev, def->id, false); 86 + extcon_set_state_sync(data->edev, def->id, false); 87 87 } 88 88 } 89 89
+8 -8
drivers/extcon/extcon-arizona.c
··· 614 614 } 615 615 616 616 /* If the cable was removed while measuring ignore the result */ 617 - ret = extcon_get_cable_state_(info->edev, EXTCON_MECHANICAL); 617 + ret = extcon_get_state(info->edev, EXTCON_MECHANICAL); 618 618 if (ret < 0) { 619 619 dev_err(arizona->dev, "Failed to check cable state: %d\n", 620 620 ret); ··· 649 649 else 650 650 report = EXTCON_JACK_HEADPHONE; 651 651 652 - ret = extcon_set_cable_state_(info->edev, report, true); 652 + ret = extcon_set_state_sync(info->edev, report, true); 653 653 if (ret != 0) 654 654 dev_err(arizona->dev, "Failed to report HP/line: %d\n", 655 655 ret); ··· 732 732 ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC); 733 733 734 734 /* Just report headphone */ 735 - ret = extcon_set_cable_state_(info->edev, EXTCON_JACK_HEADPHONE, true); 735 + ret = extcon_set_state_sync(info->edev, EXTCON_JACK_HEADPHONE, true); 736 736 if (ret != 0) 737 737 dev_err(arizona->dev, "Failed to report headphone: %d\n", ret); 738 738 ··· 789 789 ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC); 790 790 791 791 /* Just report headphone */ 792 - ret = extcon_set_cable_state_(info->edev, EXTCON_JACK_HEADPHONE, true); 792 + ret = extcon_set_state_sync(info->edev, EXTCON_JACK_HEADPHONE, true); 793 793 if (ret != 0) 794 794 dev_err(arizona->dev, "Failed to report headphone: %d\n", ret); 795 795 ··· 829 829 mutex_lock(&info->lock); 830 830 831 831 /* If the cable was removed while measuring ignore the result */ 832 - ret = extcon_get_cable_state_(info->edev, EXTCON_MECHANICAL); 832 + ret = extcon_get_state(info->edev, EXTCON_MECHANICAL); 833 833 if (ret < 0) { 834 834 dev_err(arizona->dev, "Failed to check cable state: %d\n", 835 835 ret); ··· 914 914 915 915 arizona_identify_headphone(info); 916 916 917 - ret = extcon_set_cable_state_(info->edev, 917 + ret = extcon_set_state_sync(info->edev, 918 918 EXTCON_JACK_MICROPHONE, true); 919 919 if (ret != 0) 920 920 dev_err(arizona->dev, "Headset report failed: %d\n", ··· 1108 1108 1109 1109 if (info->last_jackdet == present) { 1110 1110 dev_dbg(arizona->dev, "Detected jack\n"); 1111 - ret = extcon_set_cable_state_(info->edev, 1111 + ret = extcon_set_state_sync(info->edev, 1112 1112 EXTCON_MECHANICAL, true); 1113 1113 1114 1114 if (ret != 0) ··· 1150 1150 input_sync(info->input); 1151 1151 1152 1152 for (i = 0; i < ARRAY_SIZE(arizona_cable) - 1; i++) { 1153 - ret = extcon_set_cable_state_(info->edev, 1153 + ret = extcon_set_state_sync(info->edev, 1154 1154 arizona_cable[i], false); 1155 1155 if (ret != 0) 1156 1156 dev_err(arizona->dev,
+1 -1
drivers/extcon/extcon-axp288.c
··· 226 226 } 227 227 228 228 if (notify_charger) 229 - extcon_set_cable_state_(info->edev, cable, vbus_attach); 229 + extcon_set_state_sync(info->edev, cable, vbus_attach); 230 230 231 231 /* Clear the flags on disconnect event */ 232 232 if (!vbus_attach)
+1 -1
drivers/extcon/extcon-gpio.c
··· 49 49 state = gpiod_get_value_cansleep(data->id_gpiod); 50 50 if (data->pdata->gpio_active_low) 51 51 state = !state; 52 - extcon_set_cable_state_(data->edev, data->pdata->extcon_id, state); 52 + extcon_set_state_sync(data->edev, data->pdata->extcon_id, state); 53 53 } 54 54 55 55 static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
+7 -7
drivers/extcon/extcon-max14577.c
··· 357 357 if (ret < 0) 358 358 return ret; 359 359 360 - extcon_set_cable_state_(info->edev, EXTCON_JIG, attached); 360 + extcon_set_state_sync(info->edev, EXTCON_JIG, attached); 361 361 362 362 return 0; 363 363 } ··· 454 454 if (ret < 0) 455 455 return ret; 456 456 457 - extcon_set_cable_state_(info->edev, EXTCON_USB, attached); 458 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, 457 + extcon_set_state_sync(info->edev, EXTCON_USB, attached); 458 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP, 459 459 attached); 460 460 break; 461 461 case MAX14577_CHARGER_TYPE_DEDICATED_CHG: 462 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, 462 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP, 463 463 attached); 464 464 break; 465 465 case MAX14577_CHARGER_TYPE_DOWNSTREAM_PORT: 466 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP, 466 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_CDP, 467 467 attached); 468 468 break; 469 469 case MAX14577_CHARGER_TYPE_SPECIAL_500MA: 470 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW, 470 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SLOW, 471 471 attached); 472 472 break; 473 473 case MAX14577_CHARGER_TYPE_SPECIAL_1A: 474 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST, 474 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST, 475 475 attached); 476 476 break; 477 477 case MAX14577_CHARGER_TYPE_NONE:
+4 -4
drivers/extcon/extcon-max3355.c
··· 39 39 * As we don't have event for USB peripheral cable attached, 40 40 * we simulate USB peripheral attach here. 41 41 */ 42 - extcon_set_cable_state_(data->edev, EXTCON_USB_HOST, false); 43 - extcon_set_cable_state_(data->edev, EXTCON_USB, true); 42 + extcon_set_state_sync(data->edev, EXTCON_USB_HOST, false); 43 + extcon_set_state_sync(data->edev, EXTCON_USB, true); 44 44 } else { 45 45 /* 46 46 * ID = 0 means USB HOST cable attached. 47 47 * As we don't have event for USB peripheral cable detached, 48 48 * we simulate USB peripheral detach here. 49 49 */ 50 - extcon_set_cable_state_(data->edev, EXTCON_USB, false); 51 - extcon_set_cable_state_(data->edev, EXTCON_USB_HOST, true); 50 + extcon_set_state_sync(data->edev, EXTCON_USB, false); 51 + extcon_set_state_sync(data->edev, EXTCON_USB_HOST, true); 52 52 } 53 53 54 54 return IRQ_HANDLED;
+23 -23
drivers/extcon/extcon-max77693.c
··· 505 505 if (ret < 0) 506 506 return ret; 507 507 508 - extcon_set_cable_state_(info->edev, EXTCON_DOCK, attached); 509 - extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached); 508 + extcon_set_state_sync(info->edev, EXTCON_DOCK, attached); 509 + extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached); 510 510 goto out; 511 511 case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */ 512 512 dock_id = EXTCON_DOCK; ··· 514 514 case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD: /* Dock-Audio */ 515 515 dock_id = EXTCON_DOCK; 516 516 if (!attached) { 517 - extcon_set_cable_state_(info->edev, EXTCON_USB, false); 518 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, 517 + extcon_set_state_sync(info->edev, EXTCON_USB, false); 518 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP, 519 519 false); 520 520 } 521 521 break; ··· 530 530 attached); 531 531 if (ret < 0) 532 532 return ret; 533 - extcon_set_cable_state_(info->edev, dock_id, attached); 533 + extcon_set_state_sync(info->edev, dock_id, attached); 534 534 535 535 out: 536 536 return 0; ··· 596 596 attached); 597 597 if (ret < 0) 598 598 return ret; 599 - extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, attached); 599 + extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached); 600 600 break; 601 601 case MAX77693_MUIC_GND_AV_CABLE_LOAD: 602 602 /* Audio Video Cable with load, PATH:AUDIO */ ··· 604 604 attached); 605 605 if (ret < 0) 606 606 return ret; 607 - extcon_set_cable_state_(info->edev, EXTCON_USB, attached); 608 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, 607 + extcon_set_state_sync(info->edev, EXTCON_USB, attached); 608 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP, 609 609 attached); 610 610 break; 611 611 case MAX77693_MUIC_GND_MHL: 612 612 case MAX77693_MUIC_GND_MHL_VB: 613 613 /* MHL or MHL with USB/TA cable */ 614 - extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached); 614 + extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached); 615 615 break; 616 616 default: 617 617 dev_err(info->dev, "failed to detect %s cable of gnd type\n", ··· 653 653 if (ret < 0) 654 654 return ret; 655 655 656 - extcon_set_cable_state_(info->edev, EXTCON_JIG, attached); 656 + extcon_set_state_sync(info->edev, EXTCON_JIG, attached); 657 657 658 658 return 0; 659 659 } ··· 807 807 * - Support charging through micro-usb port without 808 808 * data connection 809 809 */ 810 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, 810 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP, 811 811 attached); 812 812 if (!cable_attached) 813 - extcon_set_cable_state_(info->edev, 813 + extcon_set_state_sync(info->edev, 814 814 EXTCON_DISP_MHL, cable_attached); 815 815 break; 816 816 } ··· 834 834 * - Support charging through micro-usb port without 835 835 * data connection. 836 836 */ 837 - extcon_set_cable_state_(info->edev, EXTCON_USB, 837 + extcon_set_state_sync(info->edev, EXTCON_USB, 838 838 attached); 839 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, 839 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP, 840 840 attached); 841 841 842 842 if (!cable_attached) 843 - extcon_set_cable_state_(info->edev, EXTCON_DOCK, 843 + extcon_set_state_sync(info->edev, EXTCON_DOCK, 844 844 cable_attached); 845 845 break; 846 846 case MAX77693_MUIC_ADC_RESERVED_ACC_3: /* Dock-Smart */ ··· 869 869 if (ret < 0) 870 870 return ret; 871 871 872 - extcon_set_cable_state_(info->edev, EXTCON_DOCK, 872 + extcon_set_state_sync(info->edev, EXTCON_DOCK, 873 873 attached); 874 - extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, 874 + extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, 875 875 attached); 876 876 break; 877 877 } ··· 905 905 if (ret < 0) 906 906 return ret; 907 907 908 - extcon_set_cable_state_(info->edev, EXTCON_USB, 908 + extcon_set_state_sync(info->edev, EXTCON_USB, 909 909 attached); 910 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, 910 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP, 911 911 attached); 912 912 break; 913 913 case MAX77693_CHARGER_TYPE_DEDICATED_CHG: 914 914 /* Only TA cable */ 915 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, 915 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP, 916 916 attached); 917 917 break; 918 918 } 919 919 break; 920 920 case MAX77693_CHARGER_TYPE_DOWNSTREAM_PORT: 921 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP, 921 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_CDP, 922 922 attached); 923 923 break; 924 924 case MAX77693_CHARGER_TYPE_APPLE_500MA: 925 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW, 925 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SLOW, 926 926 attached); 927 927 break; 928 928 case MAX77693_CHARGER_TYPE_APPLE_1A_2A: 929 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST, 929 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST, 930 930 attached); 931 931 break; 932 932 case MAX77693_CHARGER_TYPE_DEAD_BATTERY:
+11 -11
drivers/extcon/extcon-max77843.c
··· 346 346 if (ret < 0) 347 347 return ret; 348 348 349 - extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, attached); 349 + extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached); 350 350 break; 351 351 case MAX77843_MUIC_GND_MHL_VB: 352 352 case MAX77843_MUIC_GND_MHL: ··· 356 356 if (ret < 0) 357 357 return ret; 358 358 359 - extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached); 359 + extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached); 360 360 break; 361 361 default: 362 362 dev_err(info->dev, "failed to detect %s accessory(gnd:0x%x)\n", ··· 392 392 if (ret < 0) 393 393 return ret; 394 394 395 - extcon_set_cable_state_(info->edev, EXTCON_JIG, attached); 395 + extcon_set_state_sync(info->edev, EXTCON_JIG, attached); 396 396 397 397 return 0; 398 398 } ··· 486 486 if (ret < 0) 487 487 return ret; 488 488 489 - extcon_set_cable_state_(info->edev, EXTCON_USB, attached); 490 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, 489 + extcon_set_state_sync(info->edev, EXTCON_USB, attached); 490 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP, 491 491 attached); 492 492 break; 493 493 case MAX77843_MUIC_CHG_DOWNSTREAM: ··· 497 497 if (ret < 0) 498 498 return ret; 499 499 500 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP, 500 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_CDP, 501 501 attached); 502 502 break; 503 503 case MAX77843_MUIC_CHG_DEDICATED: ··· 507 507 if (ret < 0) 508 508 return ret; 509 509 510 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, 510 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP, 511 511 attached); 512 512 break; 513 513 case MAX77843_MUIC_CHG_SPECIAL_500MA: ··· 517 517 if (ret < 0) 518 518 return ret; 519 519 520 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW, 520 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SLOW, 521 521 attached); 522 522 break; 523 523 case MAX77843_MUIC_CHG_SPECIAL_1A: ··· 527 527 if (ret < 0) 528 528 return ret; 529 529 530 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST, 530 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST, 531 531 attached); 532 532 break; 533 533 case MAX77843_MUIC_CHG_GND: ··· 536 536 537 537 /* Charger cable on MHL accessory is attach or detach */ 538 538 if (gnd_type == MAX77843_MUIC_GND_MHL_VB) 539 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, 539 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP, 540 540 true); 541 541 else if (gnd_type == MAX77843_MUIC_GND_MHL) 542 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, 542 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP, 543 543 false); 544 544 break; 545 545 case MAX77843_MUIC_CHG_NONE:
+10 -10
drivers/extcon/extcon-max8997.c
··· 331 331 332 332 switch (usb_type) { 333 333 case MAX8997_USB_HOST: 334 - extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, attached); 334 + extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached); 335 335 break; 336 336 case MAX8997_USB_DEVICE: 337 - extcon_set_cable_state_(info->edev, EXTCON_USB, attached); 338 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, 337 + extcon_set_state_sync(info->edev, EXTCON_USB, attached); 338 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP, 339 339 attached); 340 340 break; 341 341 default: ··· 361 361 switch (cable_type) { 362 362 case MAX8997_MUIC_ADC_AV_CABLE_NOLOAD: 363 363 case MAX8997_MUIC_ADC_FACTORY_MODE_UART_ON: 364 - extcon_set_cable_state_(info->edev, EXTCON_DOCK, attached); 364 + extcon_set_state_sync(info->edev, EXTCON_DOCK, attached); 365 365 break; 366 366 default: 367 367 dev_err(info->dev, "failed to detect %s dock device\n", ··· 384 384 return ret; 385 385 } 386 386 387 - extcon_set_cable_state_(info->edev, EXTCON_JIG, attached); 387 + extcon_set_state_sync(info->edev, EXTCON_JIG, attached); 388 388 389 389 return 0; 390 390 } ··· 406 406 return ret; 407 407 break; 408 408 case MAX8997_MUIC_ADC_MHL: 409 - extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached); 409 + extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached); 410 410 break; 411 411 case MAX8997_MUIC_ADC_FACTORY_MODE_USB_OFF: 412 412 case MAX8997_MUIC_ADC_FACTORY_MODE_USB_ON: ··· 489 489 } 490 490 break; 491 491 case MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT: 492 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP, 492 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_CDP, 493 493 attached); 494 494 break; 495 495 case MAX8997_CHARGER_TYPE_DEDICATED_CHG: 496 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, 496 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP, 497 497 attached); 498 498 break; 499 499 case MAX8997_CHARGER_TYPE_500MA: 500 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW, 500 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SLOW, 501 501 attached); 502 502 break; 503 503 case MAX8997_CHARGER_TYPE_1A: 504 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST, 504 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST, 505 505 attached); 506 506 break; 507 507 default:
+8 -8
drivers/extcon/extcon-palmas.c
··· 61 61 if (vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS) { 62 62 if (palmas_usb->linkstat != PALMAS_USB_STATE_VBUS) { 63 63 palmas_usb->linkstat = PALMAS_USB_STATE_VBUS; 64 - extcon_set_cable_state_(edev, EXTCON_USB, true); 64 + extcon_set_state_sync(edev, EXTCON_USB, true); 65 65 dev_info(palmas_usb->dev, "USB cable is attached\n"); 66 66 } else { 67 67 dev_dbg(palmas_usb->dev, ··· 70 70 } else if (!(vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS)) { 71 71 if (palmas_usb->linkstat == PALMAS_USB_STATE_VBUS) { 72 72 palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; 73 - extcon_set_cable_state_(edev, EXTCON_USB, false); 73 + extcon_set_state_sync(edev, EXTCON_USB, false); 74 74 dev_info(palmas_usb->dev, "USB cable is detached\n"); 75 75 } else { 76 76 dev_dbg(palmas_usb->dev, ··· 98 98 PALMAS_USB_ID_INT_LATCH_CLR, 99 99 PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND); 100 100 palmas_usb->linkstat = PALMAS_USB_STATE_ID; 101 - extcon_set_cable_state_(edev, EXTCON_USB_HOST, true); 101 + extcon_set_state_sync(edev, EXTCON_USB_HOST, true); 102 102 dev_info(palmas_usb->dev, "USB-HOST cable is attached\n"); 103 103 } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) && 104 104 (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) { ··· 106 106 PALMAS_USB_ID_INT_LATCH_CLR, 107 107 PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT); 108 108 palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; 109 - extcon_set_cable_state_(edev, EXTCON_USB_HOST, false); 109 + extcon_set_state_sync(edev, EXTCON_USB_HOST, false); 110 110 dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); 111 111 } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) && 112 112 (!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) { 113 113 palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; 114 - extcon_set_cable_state_(edev, EXTCON_USB_HOST, false); 114 + extcon_set_state_sync(edev, EXTCON_USB_HOST, false); 115 115 dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); 116 116 } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) && 117 117 (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) { 118 118 palmas_usb->linkstat = PALMAS_USB_STATE_ID; 119 - extcon_set_cable_state_(edev, EXTCON_USB_HOST, true); 119 + extcon_set_state_sync(edev, EXTCON_USB_HOST, true); 120 120 dev_info(palmas_usb->dev, " USB-HOST cable is attached\n"); 121 121 } 122 122 ··· 137 137 id = gpiod_get_value_cansleep(palmas_usb->id_gpiod); 138 138 139 139 if (id) { 140 - extcon_set_cable_state_(edev, EXTCON_USB_HOST, false); 140 + extcon_set_state_sync(edev, EXTCON_USB_HOST, false); 141 141 dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); 142 142 } else { 143 - extcon_set_cable_state_(edev, EXTCON_USB_HOST, true); 143 + extcon_set_state_sync(edev, EXTCON_USB_HOST, true); 144 144 dev_info(palmas_usb->dev, "USB-HOST cable is attached\n"); 145 145 } 146 146 }
+2 -2
drivers/extcon/extcon-rt8973a.c
··· 398 398 return ret; 399 399 400 400 /* Change the state of external accessory */ 401 - extcon_set_cable_state_(info->edev, id, attached); 401 + extcon_set_state_sync(info->edev, id, attached); 402 402 if (id == EXTCON_USB) 403 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, 403 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP, 404 404 attached); 405 405 406 406 return 0;
+2 -2
drivers/extcon/extcon-sm5502.c
··· 411 411 return ret; 412 412 413 413 /* Change the state of external accessory */ 414 - extcon_set_cable_state_(info->edev, id, attached); 414 + extcon_set_state_sync(info->edev, id, attached); 415 415 if (id == EXTCON_USB) 416 - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, 416 + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP, 417 417 attached); 418 418 419 419 return 0;
+4 -4
drivers/extcon/extcon-usb-gpio.c
··· 63 63 * As we don't have event for USB peripheral cable attached, 64 64 * we simulate USB peripheral attach here. 65 65 */ 66 - extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, false); 67 - extcon_set_cable_state_(info->edev, EXTCON_USB, true); 66 + extcon_set_state_sync(info->edev, EXTCON_USB_HOST, false); 67 + extcon_set_state_sync(info->edev, EXTCON_USB, true); 68 68 } else { 69 69 /* 70 70 * ID = 0 means USB HOST cable attached. 71 71 * As we don't have event for USB peripheral cable detached, 72 72 * we simulate USB peripheral detach here. 73 73 */ 74 - extcon_set_cable_state_(info->edev, EXTCON_USB, false); 75 - extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, true); 74 + extcon_set_state_sync(info->edev, EXTCON_USB, false); 75 + extcon_set_state_sync(info->edev, EXTCON_USB_HOST, true); 76 76 } 77 77 } 78 78