From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753634AbcL3ETT (ORCPT ); Thu, 29 Dec 2016 23:19:19 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:54099 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753458AbcL3ETS (ORCPT ); Thu, 29 Dec 2016 23:19:18 -0500 X-AuditID: b6c32a58-f79726d000001ac1-c8-5865e0438e96 From: Chanwoo Choi To: b-liu@ti.com, gregkh@linuxfoundation.org Cc: maxime.ripard@free-electrons.com, wens@csie.org, linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, chanwoo@kernel.org, Chanwoo Choi Subject: [PATCH v2] usb: musb: sunxi: Uses the resource-managed extcon API when registering extcon notifier Date: Fri, 30 Dec 2016 13:19:10 +0900 Message-id: <1483071550-8683-1-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 X-Brightmail-Tracker: H4sIAAAAAAAAAzWSa0gUURTHuzs74yhuDKvpxShkKCLJzVlXd0wNH0sNFbHolyXRbdCLa+2L ndW0LxllDyl7SGSQJJYZW6JtapaPbMOkoIcWKuL7XX5I0MIets3uGPfL/5z7+59z7uWQmPIt HkEWWJ3IYeXNNBEkb321MypaN4EMMd8OsN6RWpy9NvRZzg6uzOPsmbuNBOueHsDZT89vE2zt /TKMbXF3YuxPzwdZSiDXNPUQ52bcfYBzuy4S3IvqRwHck3unuIpmF+B6h57KuGX3Vj15BCWZ EJ+HHJHImmvLK7DmJ9MHM43pxrj4GCaaSWC1dKSVt6BkWndIH72vwCxOR0cW8eZCMaXnBYHe vTfJYSt0okiTTXAm01kMo1YxMVqVWq1WaWKz96jjROQoMn1vrMPtAxuLR6dzSkF1cDkgSUhp 4OSCKANFGQY/jjUS5SCIVFJ1APa2e3ApOC+DTY9dARKlgaOuWeDTSqoewLbaYglaBfDXxWHC d0FQUfDFwpBfh1K7YNdSt9wHYVQ/gDdby/zuEMoC7wyO+7Wc2g5/vz+D+bSC0sHK+jfr3bbC pY6pAJ8ZUl4C3rpXTkhzb4HubkxidNDb0SCXdAj82tu87t0M1+qGgeStBLC8YQ2TgksAnn7U Q0hULByfGPNXwqiN8PLvGZnUQAEvnFNKCAcXf02t46mwr/olJj0/Gza8rpNfBZtrwAYXCEN2 wZKPhDi7RiXwFqHQmq/KtVncwL9HUYY28LcqwwMoEtDBitUiZFDifJFQYvEASGJ0qCJ9TEwp 8viSk8hhMzoKzUjwgDjxb65hEZtybeJWWp1GRhPPaNQJ4tEyWjpcUVOcaFBS+bwTHUfIjhz/ fTIyMKIUdPOZHfqMP0eyXCsP0mtK09ypnZlbtv20VO2YS9lVo/bO6+bB2Q9no3Pm6hPjg2/l eS369lVw910znpHWpW2f6SnrrrJVVmy43hZu7lnN7v/i8Eag/rDJsJUfh1uuVJeNZN1Ye1Bv b+m4uc+omtUsVpiWjzXtN/TPnSCfpbhqT9FywcQzUZhD4P8BgWGgJF0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRmVeSWpSXmKPExsVy+t9jAV2nB6kRBpMapCz+31nEajHxxhUW i+tfnrNaNC9ez2ax6fE1VovLu+awWSxa1spssXXTXmaLn4fOMzlwemx4tJrV48mmi4wem1Z1 snnsn7uG3WPzknqPvi2rGD2O39jO5PF5k1wAR5SbTUZqYkpqkUJqXnJ+SmZeuq1SaIibroWS Ql5ibqqtUoSub0iQkkJZYk4pkGdkgAYcnAPcg5X07RLcMr6uX8pacI2v4u7juAbGuTxdjJwc EgImEndXPWWEsMUkLtxbz9bFyMUhJLCUUeLd3nWsEM4PRonzs/+zgFSxCWhJ7H9xgw3EFhHQ kdj34QALSBGzwAVGiTsHJ4ONEhbIlZi94iI7iM0ioCrx+1wzM4jNK+AiMXn5SXaIdXISH/Y8 Yp/AyL2AkWEVo0RqQXJBcVJ6rlFearlecWJucWleul5yfu4mRnBQP5PewXh4l/shRgEORiUe 3h9lqRFCrIllxZW5hxglOJiVRHid7wGFeFMSK6tSi/Lji0pzUosPMZoCHTCRWUo0OR8YcXkl 8YYm5ibmxgYW5paWJkZK4ryNs5+FCwmkJ5akZqemFqQWwfQxcXBKNTAmuBp931S9YGfl1adn XG/wZ+feK7yl84VXv/aC4cvzk1YoLk75o7dk/efeCzmfP/tsfnXto3XR2k1np8x7dHP+zbKV v2bdLlr8IqD0usrWvWk3Jp088rF4gcwpvThzbYVAhdtBC2sLAnvsGwR2Rob94Ctav3PdpuxI 63SrYstHMzcuNH/9YSHLUiWW4oxEQy3mouJEAJsiVmOAAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161230041914epcas5p24826e70fd5de710818687e55579757ba X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 X-Local-Sender: =?UTF-8?B?7LWc7LCs7JqwG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbUzUo7LGF7J6EKS9DaGFuZ2UgQWdlbnQ=?= X-Global-Sender: =?UTF-8?B?Q2hhbndvbyBDaG9pG1RpemVuIFBsYXRmb3JtIExhYi4bU2Ft?= =?UTF-8?B?c3VuZyBFbGVjdHJvbmljcxtTNS9TZW5pb3IgRW5naW5lZXI=?= X-Sender-Code: =?UTF-8?B?QzEwG1NUQUYbQzEwVjgxMTE=?= CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20161230041914epcas5p24826e70fd5de710818687e55579757ba X-RootMTR: 20161230041914epcas5p24826e70fd5de710818687e55579757ba References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch just uses the resource-managed extcon API when registering the extcon notifier. Signed-off-by: Chanwoo Choi Acked-by: Maxime Ripard Acked-by: Bin Liu --- Changes from v1: - Rebase this patch based on v4.10-rc1. - Add acked-by tag from Maxime Ripard and Bin Lin. - Drop the phy/power-supply/chipidea patches. drivers/usb/musb/sunxi.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c index d0be0eadd0d9..2332294dee0f 100644 --- a/drivers/usb/musb/sunxi.c +++ b/drivers/usb/musb/sunxi.c @@ -251,14 +251,14 @@ static int sunxi_musb_init(struct musb *musb) writeb(SUNXI_MUSB_VEND0_PIO_MODE, musb->mregs + SUNXI_MUSB_VEND0); /* Register notifier before calling phy_init() */ - ret = extcon_register_notifier(glue->extcon, EXTCON_USB_HOST, - &glue->host_nb); + ret = devm_extcon_register_notifier(glue->dev, glue->extcon, + EXTCON_USB_HOST, &glue->host_nb); if (ret) goto error_reset_assert; ret = phy_init(glue->phy); if (ret) - goto error_unregister_notifier; + goto error_reset_assert; musb->isr = sunxi_musb_interrupt; @@ -267,9 +267,6 @@ static int sunxi_musb_init(struct musb *musb) return 0; -error_unregister_notifier: - extcon_unregister_notifier(glue->extcon, EXTCON_USB_HOST, - &glue->host_nb); error_reset_assert: if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags)) reset_control_assert(glue->rst); @@ -293,9 +290,6 @@ static int sunxi_musb_exit(struct musb *musb) phy_exit(glue->phy); - extcon_unregister_notifier(glue->extcon, EXTCON_USB_HOST, - &glue->host_nb); - if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags)) reset_control_assert(glue->rst); -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: cw00.choi@samsung.com (Chanwoo Choi) Date: Fri, 30 Dec 2016 13:19:10 +0900 Subject: [PATCH v2] usb: musb: sunxi: Uses the resource-managed extcon API when registering extcon notifier References: Message-ID: <1483071550-8683-1-git-send-email-cw00.choi@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This patch just uses the resource-managed extcon API when registering the extcon notifier. Signed-off-by: Chanwoo Choi Acked-by: Maxime Ripard Acked-by: Bin Liu --- Changes from v1: - Rebase this patch based on v4.10-rc1. - Add acked-by tag from Maxime Ripard and Bin Lin. - Drop the phy/power-supply/chipidea patches. drivers/usb/musb/sunxi.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c index d0be0eadd0d9..2332294dee0f 100644 --- a/drivers/usb/musb/sunxi.c +++ b/drivers/usb/musb/sunxi.c @@ -251,14 +251,14 @@ static int sunxi_musb_init(struct musb *musb) writeb(SUNXI_MUSB_VEND0_PIO_MODE, musb->mregs + SUNXI_MUSB_VEND0); /* Register notifier before calling phy_init() */ - ret = extcon_register_notifier(glue->extcon, EXTCON_USB_HOST, - &glue->host_nb); + ret = devm_extcon_register_notifier(glue->dev, glue->extcon, + EXTCON_USB_HOST, &glue->host_nb); if (ret) goto error_reset_assert; ret = phy_init(glue->phy); if (ret) - goto error_unregister_notifier; + goto error_reset_assert; musb->isr = sunxi_musb_interrupt; @@ -267,9 +267,6 @@ static int sunxi_musb_init(struct musb *musb) return 0; -error_unregister_notifier: - extcon_unregister_notifier(glue->extcon, EXTCON_USB_HOST, - &glue->host_nb); error_reset_assert: if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags)) reset_control_assert(glue->rst); @@ -293,9 +290,6 @@ static int sunxi_musb_exit(struct musb *musb) phy_exit(glue->phy); - extcon_unregister_notifier(glue->extcon, EXTCON_USB_HOST, - &glue->host_nb); - if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags)) reset_control_assert(glue->rst); -- 1.9.1