Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1532972

[PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier

From Chanwoo Choi <cw00.choi@samsung.com>
Newsgroups linux.kernel
Subject [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier
Date 2016-11-30 07:00 +0100
Message-ID <sJ65X-214-11@gated-at.bofh.it> (permalink)
References <sJ65X-214-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


This patch just uses the resource-managed extcon API when registering
the extcon notifier.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 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 1408245be18e..4b531551e49d 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -261,14 +261,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;
 
@@ -277,9 +277,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);
@@ -303,9 +300,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

Back to linux.kernel | Previous | NextNext in thread | Find similar | Unroll thread


Thread

[PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when  registering extcon notifier Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-30 07:00 +0100
  Re: [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API  when registering extcon notifier Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-11-30 09:50 +0100
    Re: [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API  when registering extcon notifier Bin Liu <b-liu@ti.com> - 2016-12-05 17:40 +0100
      Re: [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API  when registering extcon notifier Chanwoo Choi <cw00.choi@samsung.com> - 2016-12-06 01:30 +0100

csiph-web