From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751892AbcDRFbx (ORCPT ); Mon, 18 Apr 2016 01:31:53 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:37844 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751413AbcDRFbu convert rfc822-to-8bit (ORCPT ); Mon, 18 Apr 2016 01:31:50 -0400 X-AuditID: cbfee68d-f79e86d0000012da-ac-5714713dfc1e MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 8BIT Message-id: <5714713D.7000903@samsung.com> Date: Mon, 18 Apr 2016 14:31:41 +0900 From: Chanwoo Choi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 To: Sebastian Reichel Cc: dbaryshkov@gmail.com, dwmw2@infradead.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [RESEND PATCH 2/3] power: axp288_charger: Replace deprecatd API of extcon References: <1460681016-2770-1-git-send-email-cw00.choi@samsung.com> <1460681016-2770-3-git-send-email-cw00.choi@samsung.com> <20160415142053.GB24087@earth> In-reply-to: <20160415142053.GB24087@earth> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsWyRsSkRNe2UCTcYGWzvMWkJ++ZLeYfOcdq MXHlZGaLy7vmsFl87j3CaHF6d4kDm8fOWXfZPTav0PLYtKqTzePzJrkAligum5TUnMyy1CJ9 uwSujLU3L7MVNMhXXN3zhbWBsVGqi5GTQ0LARGL9oteMELaYxIV769m6GLk4hARWMEoc3X+F FaZoac8tJojEUkaJZTvesYMkeAUEJX5MvscCYjMLqEtMmreIGcIWkfhz/yNUXFti2cLXzBDN Dxglps/YwwjRrCVx7+dpsA0sAqoS7TvOs4HYbEDx/S9uANkcHKICERLdJypBwiICahLvLz1l AZnDLNDMKLFlzTywI4SBajZenMMIsWABo8SDbZOYQBKcQJvPffrCCpKQEDjGLvH4XTcjxDYB iW+TD7GAbJAQkJXYdIAZ4k1JiYMrbrBMYBSfheS5WUiem4XkuVlInlvAyLKKUTS1ILmgOCm9 yFCvODG3uDQvXS85P3cTIzAmT/971ruD8fYB60OMAhyMSjy8EQwi4UKsiWXFlbmHGE2BLprI LCWanA+M/LySeENjMyMLUxNTYyNzSzMlcV5FqZ/BQgLpiSWp2ampBalF8UWlOanFhxiZODil GhjXLN21q/yiQ51Kz5NVVwJPbN4QerYg4NZGgVdm3GtOSfIVhUa18e1ZdriniH3KDBN7/p6b oi6Ozyo0vXsW1L2ZwHz6ZN3FtEcCTSpFQZkSB35HuhzKX8dSILvxzj5R17vLCnssl0m+eJCV W6PqpDXppPMv0/2/tm/c8d1/sqlyUOb+qaXW99YpsRRnJBpqMRcVJwIAeMKRycQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCIsWRmVeSWpSXmKPExsVy+t9jAV3bQpFwg6fzxCwmPXnPbDH/yDlW i4krJzNbXN41h83ic+8RRovTu0sc2Dx2zrrL7rF5hZbHplWdbB6fN8kFsEQ1MNpkpCampBYp pOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXmAO1WUihLzCkFCgUkFhcr 6dthmhAa4qZrAdMYoesbEgTXY2SABhLWMGbsff2cveCJXMXGK/eZGxifSnYxcnJICJhILO25 xQRhi0lcuLeerYuRi0NIYCmjxLId79hBErwCghI/Jt9j6WLk4GAWkJc4cikbJMwsoC4xad4i Zoj6B4wS02fsYYSo15K49/M0K4jNIqAq0b7jPBuIzQYU3//iBhvIHFGBCInuE5UgYREBNYn3 l56ygMxhFmhmlNiyZh7YXmGgmo0X5zBCLFjAKPFg2ySwSzkFtCXOffrCOoFRYBaS+2Yh3DcL yX0LGJlXMUqkFiQXFCel5xrmpZbrFSfmFpfmpesl5+duYgTH8DOpHYwHd7kfYhTgYFTi4Y1g EAkXYk0sK67MPcQowcGsJML7Mh8oxJuSWFmVWpQfX1Sak1p8iNEU6MGJzFKiyfnA9JJXEm9o bGJmZGlkbmhhZGyuJM77+P+6MCGB9MSS1OzU1ILUIpg+Jg5OqQbGHt6Zt4Itvz7k2/VpX+a2 2lMXZlZuqlvcF63/YJNA0cyfc0xeilW9/N23/gLz2v+u6pNe7M4y31ust13a6toxY6VbDLKF buVbKk+Fr/28/NefH232r/3VNh2vl+T0emwmEBfS2pXI8tLgTVV3gfr+8Mq+j3K8V5UCd3sV PDd42sL8zbymIspMiaU4I9FQi7moOBEA3mWhFfcCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sebastian, On 2016년 04월 15일 23:20, Sebastian Reichel wrote: > Hi, > > On Fri, Apr 15, 2016 at 09:43:35AM +0900, Chanwoo Choi wrote: >> This patch removes the deprecated notifier API of extcon framework and then use >> the new extcon API[2] with the unique id[1] to indicate the each external >> connector. Alter deprecated API as following: >> - extcon_register_interest() -> extcon_register_notifier() >> - extcon_unregister_interest() -> extcon_unregister_notifier() >> - extcon_get_cable_state() -> extcon_get_cable_state_() >> >> And, extcon alters the name of USB charger connector in patch[3] as following: >> - EXTCON_CHG_USB_SDP /* Standard Downstream Port */ >> - EXTCON_CHG_USB_DCP /* Dedicated Charging Port */ >> - EXTCON_CHG_USB_CDP /* Charging Downstream Port */ >> - EXTCON_CHG_USB_ACA /* Accessory Charger Adapter */ >> >> [1] Commit 2a9de9c0f08d61 >> - ("extcon: Use the unique id for external connector instead of string) >> [2] Commit 046050f6e623e4 >> - ("extcon: Update the prototype of extcon_register_notifier() with enum extcon >> [3] Commit 11eecf910bd81d >> - ("extcon: Modify the id and name of external connector") >> >> Signed-off-by: Chanwoo Choi >> --- >> drivers/power/axp288_charger.c | 77 +++++++++++++++++++++++++++++------------- >> 1 file changed, 53 insertions(+), 24 deletions(-) >> >> diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c >> index e4d569f57acc..e5c2569befa6 100644 >> --- a/drivers/power/axp288_charger.c >> +++ b/drivers/power/axp288_charger.c >> @@ -129,10 +129,6 @@ >> [snip] >> /* Register charger interrupts */ >> for (i = 0; i < CHRG_INTR_END; i++) { >> @@ -905,11 +922,17 @@ static int axp288_charger_probe(struct platform_device *pdev) >> return 0; >> >> intr_reg_failed: >> - if (info->otg.cable.edev) >> - extcon_unregister_interest(&info->otg.cable); >> + if (info->otg.cable) >> + extcon_unregister_notifier(info->otg.cable, EXTCON_USB_HOST, >> + &info->otg.id_nb); >> power_supply_unregister(info->psy_usb); >> psy_reg_failed: >> - extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb); >> + extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP, >> + &info->cable.nb); >> + extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP, >> + &info->cable.nb); > > EXTCON_CHG_USB_SDP -> EXTCON_CHG_USB_CDP? I was mistaken. I'll fix it. > >> + extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_DCP, >> + &info->cable.nb); >> return ret; >> } >> >> @@ -917,10 +940,16 @@ static int axp288_charger_remove(struct platform_device *pdev) >> { >> struct axp288_chrg_info *info = dev_get_drvdata(&pdev->dev); >> >> - if (info->otg.cable.edev) >> - extcon_unregister_interest(&info->otg.cable); >> + if (info->otg.cable) >> + extcon_unregister_notifier(info->otg.cable, EXTCON_USB_HOST, >> + &info->otg.id_nb); >> >> - extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb); >> + extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP, >> + &info->cable.nb); >> + extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP, >> + &info->cable.nb); > > EXTCON_CHG_USB_SDP -> EXTCON_CHG_USB_CDP? ditto. > >> + extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_DCP, >> + &info->cable.nb); >> power_supply_unregister(info->psy_usb); >> >> return 0; > > Has this dependencies to your tree or are all dependencies already > in torvalds tree? This patch-set have the dependency on Linus torvalds tree[1]. [1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ So, when picking this patch-set, someone make the immutable branch for this patchset to prevent the merge conflict between power_supply and extcon tree. Thanks, Chanwoo Choi