On 04/30/2015 11:00 AM, Krzysztof Kozlowski wrote: > On 27.04.2015 21:31, Chanwoo Choi wrote: >> This patch change the name of various jig cables as 'JIG' because the name of >> various jig cables are strange and ambiguous on user-space aspect. They >> include >> the different information of either USB and UART state. It is never important >> for user-space process. This patch unifies the name of jig cables as >> following: >> - JIG-USB-ON -->|--> JIG >> - JIG-USB-OFF -->| >> - JIG-UART-ON -->| >> - JIG-UART-OFF -->| >> >> Cc: Jaewon Kim <jaewon02....@samsung.com> >> Cc: Krzysztof Kozlowski <k.kozlow...@samsung.com> >> Signed-off-by: Chanwoo Choi <cw00.c...@samsung.com> >> --- >> drivers/extcon/extcon-max14577.c | 19 +++---------------- >> drivers/extcon/extcon-max77693.c | 23 +++-------------------- >> drivers/extcon/extcon-max77843.c | 39 >> ++++++++++++++------------------------- >> drivers/extcon/extcon-rt8973a.c | 22 +++++----------------- >> 4 files changed, 25 insertions(+), 78 deletions(-) >>
[snip] >> struct max77843_muic_irq { >> @@ -385,36 +379,31 @@ static int max77843_muic_jig_handler(struct >> max77843_muic_info *info, >> int cable_type, bool attached) >> { >> int ret; >> + u8 path = CTRL1_SW_OPEN; >> >> dev_dbg(info->dev, "external connector is %s (adc:0x%02x)\n", >> attached ? "attached" : "detached", cable_type); >> >> switch (cable_type) { >> case MAX77843_MUIC_ADC_FACTORY_MODE_USB_OFF: >> - ret = max77843_muic_set_path(info, CONTROL1_SW_USB, attached); >> - if (ret < 0) >> - return ret; >> - extcon_set_cable_state(info->edev, "JIG-USB-OFF", attached); >> - break; >> case MAX77843_MUIC_ADC_FACTORY_MODE_USB_ON: >> - ret = max77843_muic_set_path(info, CONTROL1_SW_USB, attached); >> - if (ret < 0) >> - return ret; >> - extcon_set_cable_state(info->edev, "JIG-USB-ON", attached); >> + path = CONTROL1_SW_USB; >> break; >> case MAX77843_MUIC_ADC_FACTORY_MODE_UART_OFF: >> - ret = max77843_muic_set_path(info, CONTROL1_SW_UART, attached); >> - if (ret < 0) >> - return ret; >> - extcon_set_cable_state(info->edev, "JIG-UART-OFF", attached); >> + path = CONTROL1_SW_UART; >> break; >> default: >> - ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached); >> - if (ret < 0) >> - return ret; >> - break; >> + dev_err(info->dev, "failed to detect %s jig cable\n", >> + attached ? "attached" : "detached"); >> + return -EINVAL; > > The logic for this default case is changed and it is not related to the patch > (unification of JIG). Could you split it into separate patch? > > Rest looks fine. OK. I'll split out. Thanks, Chanwoo Choi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/