summaryrefslogtreecommitdiffstats
path: root/drivers/extcon/extcon-palmas.c
diff options
context:
space:
mode:
authorChanwoo Choi <cw00.choi@samsung.com>2016-08-16 02:55:34 -0400
committerChanwoo Choi <cw00.choi@samsung.com>2016-09-12 22:26:26 -0400
commit8670b4598064007abfc44554e713fa2004734e1d (patch)
tree0dbe828dfa26bdd689c83b91735a756a2b484609 /drivers/extcon/extcon-palmas.c
parent525867dbd11899835a029da3532eeee9f773db31 (diff)
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>
Diffstat (limited to 'drivers/extcon/extcon-palmas.c')
-rw-r--r--drivers/extcon/extcon-palmas.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
index caff46c0e214..634ba70782de 100644
--- a/drivers/extcon/extcon-palmas.c
+++ b/drivers/extcon/extcon-palmas.c
@@ -61,7 +61,7 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
61 if (vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS) { 61 if (vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS) {
62 if (palmas_usb->linkstat != PALMAS_USB_STATE_VBUS) { 62 if (palmas_usb->linkstat != PALMAS_USB_STATE_VBUS) {
63 palmas_usb->linkstat = PALMAS_USB_STATE_VBUS; 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 dev_info(palmas_usb->dev, "USB cable is attached\n"); 65 dev_info(palmas_usb->dev, "USB cable is attached\n");
66 } else { 66 } else {
67 dev_dbg(palmas_usb->dev, 67 dev_dbg(palmas_usb->dev,
@@ -70,7 +70,7 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
70 } else if (!(vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS)) { 70 } else if (!(vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS)) {
71 if (palmas_usb->linkstat == PALMAS_USB_STATE_VBUS) { 71 if (palmas_usb->linkstat == PALMAS_USB_STATE_VBUS) {
72 palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; 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 dev_info(palmas_usb->dev, "USB cable is detached\n"); 74 dev_info(palmas_usb->dev, "USB cable is detached\n");
75 } else { 75 } else {
76 dev_dbg(palmas_usb->dev, 76 dev_dbg(palmas_usb->dev,
@@ -98,7 +98,7 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
98 PALMAS_USB_ID_INT_LATCH_CLR, 98 PALMAS_USB_ID_INT_LATCH_CLR,
99 PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND); 99 PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND);
100 palmas_usb->linkstat = PALMAS_USB_STATE_ID; 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 dev_info(palmas_usb->dev, "USB-HOST cable is attached\n"); 102 dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
103 } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) && 103 } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) &&
104 (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) { 104 (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) {
@@ -106,17 +106,17 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
106 PALMAS_USB_ID_INT_LATCH_CLR, 106 PALMAS_USB_ID_INT_LATCH_CLR,
107 PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT); 107 PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT);
108 palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; 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 dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); 110 dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
111 } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) && 111 } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) &&
112 (!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) { 112 (!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) {
113 palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; 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 dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); 115 dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
116 } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) && 116 } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) &&
117 (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) { 117 (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
118 palmas_usb->linkstat = PALMAS_USB_STATE_ID; 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 dev_info(palmas_usb->dev, " USB-HOST cable is attached\n"); 120 dev_info(palmas_usb->dev, " USB-HOST cable is attached\n");
121 } 121 }
122 122
@@ -137,10 +137,10 @@ static void palmas_gpio_id_detect(struct work_struct *work)
137 id = gpiod_get_value_cansleep(palmas_usb->id_gpiod); 137 id = gpiod_get_value_cansleep(palmas_usb->id_gpiod);
138 138
139 if (id) { 139 if (id) {
140 extcon_set_cable_state_(edev, EXTCON_USB_HOST, false); 140 extcon_set_state_sync(edev, EXTCON_USB_HOST, false);
141 dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); 141 dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
142 } else { 142 } else {
143 extcon_set_cable_state_(edev, EXTCON_USB_HOST, true); 143 extcon_set_state_sync(edev, EXTCON_USB_HOST, true);
144 dev_info(palmas_usb->dev, "USB-HOST cable is attached\n"); 144 dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
145 } 145 }
146} 146}