From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754065AbdC1Ei6 (ORCPT ); Tue, 28 Mar 2017 00:38:58 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:62183 "EHLO epoutp02.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753109AbdC1Eiy (ORCPT ); Tue, 28 Mar 2017 00:38:54 -0400 X-AuditID: b6c32a38-f791a6d0000031eb-48-58d9e8c6a9d9 From: Chanwoo Choi To: kishon@ti.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, chanwoo@kernel.org, Chanwoo Choi Subject: [PATCH 1/2] phy: qcom-usb-hs: Replace the extcon API Date: Tue, 28 Mar 2017 13:38:28 +0900 Message-id: <1490675909-2533-1-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGKsWRmVeSWpSXmKPExsWy7bCmnu6xFzcjDI7NtraYeOMKi8X1L89Z LS487WGz2PT4GqvF5V1z2BxYPTat6mTz2Lyk3qNvyypGj+M3tjN5fN4kF8AalWqTkZqYklqk kJqXnJ+SmZduq+QdHO8cb2pmYKhraGlhrqSQl5ibaqvk4hOg65aZA7RbSaEsMacUKBSQWFys pG9nU5RfWpKqkJFfXGKrFG1oaKRnaGCuZ2RkpGdiHGtlZApUkpCacWwla8E03orLjx+wNTA2 cncxcnJICJhIdL/tZISwxSQu3FvP1sXIxSEksINRou/HZHaQhJBAO5PEl7U1MA1/z6yBKprD KLH23FQWCOcHo8S3JZtYQKrYBLQk9r+4AVTFwSEiICjx6RMjSA2zQBOjxL/W1SwgcWEBW4lt m91ATBYBVYnvz8RAOnkFXCSWtp1ngtglJ/FhzyN2kFYJgSNsEr2L9jOD1EsIyEpsOsAMUeMi sfrschYIW1ji1fEt7BC2tMSqf7eYIHrbGSU2z7nHAuF0MErcX9nIClFlLHH/wT2wScwCfBLv vvawQizglehoE4Io8ZBY8+E11AJHibZvc9kggRIr8WH9QuYJjNILGBlWMYqlFhTnpqcWGxaY 6BUn5haX5qXrJefnbmIEpxEtix2Me875HGIU4GBU4uG9wHMzQog1say4MvcQowQHs5II75NW oBBvSmJlVWpRfnxRaU5q8SFGU2DQTGSWEk3OB6a4vJJ4QxNLAxMzI2CisDQ0VBLnFV1/LUJI ID2xJDU7NbUgtQimj4mDU6qB8YQGf41Yu1l0fHyJ6COxaNO4qNddm3Zpnww/kKShzS5184Xk OVH2N2VC/09cmJo1oSC7TecJT9BDAbajwkqnj2ml3Tzx70G/fUmTheqTZKm1Ew0Cq317fpru XnObkemMwBO3lxUc5/pPT6tqr/vn+JPjQ1X+q74ix+tT9+15tOnD3rcpHqwuSizFGYmGWsxF xYkAftEIjDkDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGLMWRmVeSWpSXmKPExsVy+t9jQd1jL25GGBzZrWMx8cYVFovrX56z Wlx42sNmsenxNVaLy7vmsDmwemxa1cnmsXlJvUffllWMHsdvbGfy+LxJLoA1ys0mIzUxJbVI ITUvOT8lMy/dVik0xE3XQkkhLzE31VYpQtc3JEhJoSwxpxTIMzJAAw7OAe7BSvp2CW4Zx1ay Fkzjrbj8+AFbA2MjdxcjJ4eEgInE3zNr2CBsMYkL99YD2VwcQgKzGCW2z5nAAuH8YJQ487GB FaSKTUBLYv+LG0BVHBwiAoISnz4xgoSZBZoYJbZ01oCEhQVsJbZtdgMxWQRUJb4/EwOp4BVw kVjadp4JYpWcxIc9j9gnMHIvYGRYxSiRWpBcUJyUnmuYl1quV5yYW1yal66XnJ+7iREchs+k djAe3OV+iFGAg1GJh/cCz80IIdbEsuLK3EOMEhzMSiK8T1qBQrwpiZVVqUX58UWlOanFhxhN gfZPZJYSTc4HxkheSbyhibmJubGBhbmlpYmRkjhv4+xn4UIC6YklqdmpqQWpRTB9TBycUg2M O5fZbTi19qac/+1Yc4Uou02vNyhLpbxiD81fL7s+Y/H9b0Lui5oTTgkdlvi9I+CGnoGF55Ub Eoz79A02Bq/y0Z/sxBjpdr5s7lmva7vu7LboybPmWTdL6ctM/YsL36x6smhC6YotnNtEDe5L XewJPGJ04G/n3ondk3KMjTODxJaph0vcDNjNrsRSnJFoqMVcVJwIAFX9SdJZAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170328043830epcas1p4069bda461ad648cfd6598905b7167e9f X-Msg-Generator: CA X-Sender-IP: 203.254.230.26 X-Local-Sender: =?UTF-8?B?7LWc7LCs7JqwG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbU2VuaW9yIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?Q2hhbndvbyBDaG9pG1RpemVuIFBsYXRmb3JtIExhYi4bU2Ft?= =?UTF-8?B?c3VuZyBFbGVjdHJvbmljcxtTZW5pb3IgRW5naW5lZXI=?= X-Sender-Code: =?UTF-8?B?QzEwG1NUQUYbQzEwVjgxMTE=?= CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20170328043830epcas1p4069bda461ad648cfd6598905b7167e9f X-RootMTR: 20170328043830epcas1p4069bda461ad648cfd6598905b7167e9f References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch uses the resource-managed extcon API for extcon_register_notifier() and replaces the deprecated extcon API as following: - (deprecated) extcon_get_cable_state_() -> extcon_get_state() Cc: Kishon Vijay Abraham I Signed-off-by: Chanwoo Choi --- drivers/phy/phy-qcom-usb-hs.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/phy/phy-qcom-usb-hs.c b/drivers/phy/phy-qcom-usb-hs.c index 94dfbfd739c3..f630fa553b7d 100644 --- a/drivers/phy/phy-qcom-usb-hs.c +++ b/drivers/phy/phy-qcom-usb-hs.c @@ -156,12 +156,12 @@ static int qcom_usb_hs_phy_power_on(struct phy *phy) } if (uphy->vbus_edev) { - state = extcon_get_cable_state_(uphy->vbus_edev, EXTCON_USB); + state = extcon_get_state(uphy->vbus_edev, EXTCON_USB); /* setup initial state */ qcom_usb_hs_phy_vbus_notifier(&uphy->vbus_notify, state, uphy->vbus_edev); - ret = extcon_register_notifier(uphy->vbus_edev, EXTCON_USB, - &uphy->vbus_notify); + ret = devm_extcon_register_notifier(&ulpi->dev, uphy->vbus_edev, + EXTCON_USB, &uphy->vbus_notify); if (ret) goto err_ulpi; } @@ -180,16 +180,8 @@ static int qcom_usb_hs_phy_power_on(struct phy *phy) static int qcom_usb_hs_phy_power_off(struct phy *phy) { - int ret; struct qcom_usb_hs_phy *uphy = phy_get_drvdata(phy); - if (uphy->vbus_edev) { - ret = extcon_unregister_notifier(uphy->vbus_edev, EXTCON_USB, - &uphy->vbus_notify); - if (ret) - return ret; - } - regulator_disable(uphy->v3p3); regulator_disable(uphy->v1p8); clk_disable_unprepare(uphy->sleep_clk); -- 1.9.1