UPSTREAM: extcon: gpio: Remove the usage of extcon_set_state()
authorChanwoo Choi <cw00.choi@samsung.com>
Thu, 21 Jul 2016 11:00:29 +0000 (20:00 +0900)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 3 Aug 2016 02:06:58 +0000 (10:06 +0800)
This patch removes the usage of extcon_set_state() because it uses
the bit masking to change the state of external connectors. The extcon framework
should handle the state by extcon_set_cable_state_() with extcon id.

Change-Id: I726f690d900375d36001fe4eda9b53bcdd2b4f86
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
(cherry picked from commit 448991505c967d7b44ae9ea328224ec02858c8da)

drivers/extcon/extcon-gpio.c

index 279ff8f6637da8beb62cd92bbbe63b8759c896a6..46f3c5d813ead5def8d1aff72d312dbeafc3fd3d 100644 (file)
@@ -49,7 +49,7 @@ static void gpio_extcon_work(struct work_struct *work)
        state = gpiod_get_value_cansleep(data->id_gpiod);
        if (data->pdata->gpio_active_low)
                state = !state;
-       extcon_set_state(data->edev, state);
+       extcon_set_cable_state_(data->edev, data->pdata->extcon_id, state);
 }
 
 static irqreturn_t gpio_irq_handler(int irq, void *dev_id)