From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B684C43381 for ; Sat, 30 Mar 2019 09:28:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7BCE218A3 for ; Sat, 30 Mar 2019 09:28:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730621AbfC3J2z (ORCPT ); Sat, 30 Mar 2019 05:28:55 -0400 Received: from mailgw02.mediatek.com ([1.203.163.81]:32371 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1730384AbfC3J2j (ORCPT ); Sat, 30 Mar 2019 05:28:39 -0400 X-UUID: 65079cd4cc8c4e979fad429f6ebe7f3f-20190330 X-UUID: 65079cd4cc8c4e979fad429f6ebe7f3f-20190330 Received: from mtkcas36.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 391326359; Sat, 30 Mar 2019 17:28:33 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sat, 30 Mar 2019 17:28:32 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Sat, 30 Mar 2019 17:28:31 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman CC: Matthias Brugger , Chunfeng Yun , , , , , Dongjin Kim Subject: [PATCH 3/5] usb: misc: usb3503: get optional clock by devm_clk_get_optional() Date: Sat, 30 Mar 2019 17:28:18 +0800 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <2ec86ffd7de45dabaa7257019a79f1e80751934c.1553937592.git.chunfeng.yun@mediatek.com> References: <2ec86ffd7de45dabaa7257019a79f1e80751934c.1553937592.git.chunfeng.yun@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use devm_clk_get_optional() to get optional clock Cc: Dongjin Kim Signed-off-by: Chunfeng Yun --- drivers/usb/misc/usb3503.c | 48 ++++++++++++++------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c index d5141aa79dd4..72f39a9751b5 100644 --- a/drivers/usb/misc/usb3503.c +++ b/drivers/usb/misc/usb3503.c @@ -172,7 +172,6 @@ static int usb3503_probe(struct usb3503 *hub) hub->gpio_reset = pdata->gpio_reset; hub->mode = pdata->initial_mode; } else if (np) { - struct clk *clk; u32 rate = 0; hub->port_off_mask = 0; @@ -198,34 +197,29 @@ static int usb3503_probe(struct usb3503 *hub) } } - clk = devm_clk_get(dev, "refclk"); - if (IS_ERR(clk) && PTR_ERR(clk) != -ENOENT) { + hub->clk = devm_clk_get_optional(dev, "refclk"); + if (IS_ERR(hub->clk)) { dev_err(dev, "unable to request refclk (%ld)\n", - PTR_ERR(clk)); - return PTR_ERR(clk); + PTR_ERR(hub->clk)); + return PTR_ERR(hub->clk); } - if (!IS_ERR(clk)) { - hub->clk = clk; - - if (rate != 0) { - err = clk_set_rate(hub->clk, rate); - if (err) { - dev_err(dev, - "unable to set reference clock rate to %d\n", - (int) rate); - return err; - } - } - - err = clk_prepare_enable(hub->clk); + if (rate != 0) { + err = clk_set_rate(hub->clk, rate); if (err) { dev_err(dev, - "unable to enable reference clock\n"); + "unable to set reference clock rate to %d\n", + (int)rate); return err; } } + err = clk_prepare_enable(hub->clk); + if (err) { + dev_err(dev, "unable to enable reference clock\n"); + return err; + } + property = of_get_property(np, "disabled-ports", &len); if (property && (len / sizeof(u32)) > 0) { int i; @@ -324,8 +318,7 @@ static int usb3503_i2c_remove(struct i2c_client *i2c) struct usb3503 *hub; hub = i2c_get_clientdata(i2c); - if (hub->clk) - clk_disable_unprepare(hub->clk); + clk_disable_unprepare(hub->clk); return 0; } @@ -348,8 +341,7 @@ static int usb3503_platform_remove(struct platform_device *pdev) struct usb3503 *hub; hub = platform_get_drvdata(pdev); - if (hub->clk) - clk_disable_unprepare(hub->clk); + clk_disable_unprepare(hub->clk); return 0; } @@ -358,18 +350,14 @@ static int usb3503_platform_remove(struct platform_device *pdev) static int usb3503_suspend(struct usb3503 *hub) { usb3503_switch_mode(hub, USB3503_MODE_STANDBY); - - if (hub->clk) - clk_disable_unprepare(hub->clk); + clk_disable_unprepare(hub->clk); return 0; } static int usb3503_resume(struct usb3503 *hub) { - if (hub->clk) - clk_prepare_enable(hub->clk); - + clk_prepare_enable(hub->clk); usb3503_switch_mode(hub, hub->mode); return 0; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [3/5] usb: misc: usb3503: get optional clock by devm_clk_get_optional() From: Chunfeng Yun Message-Id: Date: Sat, 30 Mar 2019 17:28:18 +0800 To: Greg Kroah-Hartman Cc: Matthias Brugger , Chunfeng Yun , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Dongjin Kim List-ID: VXNlIGRldm1fY2xrX2dldF9vcHRpb25hbCgpIHRvIGdldCBvcHRpb25hbCBjbG9jawoKQ2M6IERv bmdqaW4gS2ltIDx0b2JldHRlckBnbWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IENodW5mZW5nIFl1 biA8Y2h1bmZlbmcueXVuQG1lZGlhdGVrLmNvbT4KLS0tCiBkcml2ZXJzL3VzYi9taXNjL3VzYjM1 MDMuYyB8IDQ4ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy91c2IvbWlzYy91c2IzNTAzLmMgYi9kcml2ZXJzL3VzYi9taXNjL3VzYjM1MDMuYwpp bmRleCBkNTE0MWFhNzlkZDQuLjcyZjM5YTk3NTFiNSAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2Iv bWlzYy91c2IzNTAzLmMKKysrIGIvZHJpdmVycy91c2IvbWlzYy91c2IzNTAzLmMKQEAgLTE3Miw3 ICsxNzIsNiBAQCBzdGF0aWMgaW50IHVzYjM1MDNfcHJvYmUoc3RydWN0IHVzYjM1MDMgKmh1YikK IAkJaHViLT5ncGlvX3Jlc2V0CQk9IHBkYXRhLT5ncGlvX3Jlc2V0OwogCQlodWItPm1vZGUJCT0g cGRhdGEtPmluaXRpYWxfbW9kZTsKIAl9IGVsc2UgaWYgKG5wKSB7Ci0JCXN0cnVjdCBjbGsgKmNs azsKIAkJdTMyIHJhdGUgPSAwOwogCQlodWItPnBvcnRfb2ZmX21hc2sgPSAwOwogCkBAIC0xOTgs MzQgKzE5NywyOSBAQCBzdGF0aWMgaW50IHVzYjM1MDNfcHJvYmUoc3RydWN0IHVzYjM1MDMgKmh1 YikKIAkJCX0KIAkJfQogCi0JCWNsayA9IGRldm1fY2xrX2dldChkZXYsICJyZWZjbGsiKTsKLQkJ aWYgKElTX0VSUihjbGspICYmIFBUUl9FUlIoY2xrKSAhPSAtRU5PRU5UKSB7CisJCWh1Yi0+Y2xr ID0gZGV2bV9jbGtfZ2V0X29wdGlvbmFsKGRldiwgInJlZmNsayIpOworCQlpZiAoSVNfRVJSKGh1 Yi0+Y2xrKSkgewogCQkJZGV2X2VycihkZXYsICJ1bmFibGUgdG8gcmVxdWVzdCByZWZjbGsgKCVs ZClcbiIsCi0JCQkJCVBUUl9FUlIoY2xrKSk7Ci0JCQlyZXR1cm4gUFRSX0VSUihjbGspOworCQkJ CQlQVFJfRVJSKGh1Yi0+Y2xrKSk7CisJCQlyZXR1cm4gUFRSX0VSUihodWItPmNsayk7CiAJCX0K IAotCQlpZiAoIUlTX0VSUihjbGspKSB7Ci0JCQlodWItPmNsayA9IGNsazsKLQotCQkJaWYgKHJh dGUgIT0gMCkgewotCQkJCWVyciA9IGNsa19zZXRfcmF0ZShodWItPmNsaywgcmF0ZSk7Ci0JCQkJ aWYgKGVycikgewotCQkJCQlkZXZfZXJyKGRldiwKLQkJCQkJCSJ1bmFibGUgdG8gc2V0IHJlZmVy ZW5jZSBjbG9jayByYXRlIHRvICVkXG4iLAotCQkJCQkJKGludCkgcmF0ZSk7Ci0JCQkJCXJldHVy biBlcnI7Ci0JCQkJfQotCQkJfQotCi0JCQllcnIgPSBjbGtfcHJlcGFyZV9lbmFibGUoaHViLT5j bGspOworCQlpZiAocmF0ZSAhPSAwKSB7CisJCQllcnIgPSBjbGtfc2V0X3JhdGUoaHViLT5jbGss IHJhdGUpOwogCQkJaWYgKGVycikgewogCQkJCWRldl9lcnIoZGV2LAotCQkJCQkidW5hYmxlIHRv IGVuYWJsZSByZWZlcmVuY2UgY2xvY2tcbiIpOworCQkJCQkidW5hYmxlIHRvIHNldCByZWZlcmVu Y2UgY2xvY2sgcmF0ZSB0byAlZFxuIiwKKwkJCQkJKGludClyYXRlKTsKIAkJCQlyZXR1cm4gZXJy OwogCQkJfQogCQl9CiAKKwkJZXJyID0gY2xrX3ByZXBhcmVfZW5hYmxlKGh1Yi0+Y2xrKTsKKwkJ aWYgKGVycikgeworCQkJZGV2X2VycihkZXYsICJ1bmFibGUgdG8gZW5hYmxlIHJlZmVyZW5jZSBj bG9ja1xuIik7CisJCQlyZXR1cm4gZXJyOworCQl9CisKIAkJcHJvcGVydHkgPSBvZl9nZXRfcHJv cGVydHkobnAsICJkaXNhYmxlZC1wb3J0cyIsICZsZW4pOwogCQlpZiAocHJvcGVydHkgJiYgKGxl biAvIHNpemVvZih1MzIpKSA+IDApIHsKIAkJCWludCBpOwpAQCAtMzI0LDggKzMxOCw3IEBAIHN0 YXRpYyBpbnQgdXNiMzUwM19pMmNfcmVtb3ZlKHN0cnVjdCBpMmNfY2xpZW50ICppMmMpCiAJc3Ry dWN0IHVzYjM1MDMgKmh1YjsKIAogCWh1YiA9IGkyY19nZXRfY2xpZW50ZGF0YShpMmMpOwotCWlm IChodWItPmNsaykKLQkJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKGh1Yi0+Y2xrKTsKKwljbGtfZGlz YWJsZV91bnByZXBhcmUoaHViLT5jbGspOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0zNDgsOCArMzQx LDcgQEAgc3RhdGljIGludCB1c2IzNTAzX3BsYXRmb3JtX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1f ZGV2aWNlICpwZGV2KQogCXN0cnVjdCB1c2IzNTAzICpodWI7CiAKIAlodWIgPSBwbGF0Zm9ybV9n ZXRfZHJ2ZGF0YShwZGV2KTsKLQlpZiAoaHViLT5jbGspCi0JCWNsa19kaXNhYmxlX3VucHJlcGFy ZShodWItPmNsayk7CisJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKGh1Yi0+Y2xrKTsKIAogCXJldHVy biAwOwogfQpAQCAtMzU4LDE4ICszNTAsMTQgQEAgc3RhdGljIGludCB1c2IzNTAzX3BsYXRmb3Jt X3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogc3RhdGljIGludCB1c2IzNTAz X3N1c3BlbmQoc3RydWN0IHVzYjM1MDMgKmh1YikKIHsKIAl1c2IzNTAzX3N3aXRjaF9tb2RlKGh1 YiwgVVNCMzUwM19NT0RFX1NUQU5EQlkpOwotCi0JaWYgKGh1Yi0+Y2xrKQotCQljbGtfZGlzYWJs ZV91bnByZXBhcmUoaHViLT5jbGspOworCWNsa19kaXNhYmxlX3VucHJlcGFyZShodWItPmNsayk7 CiAKIAlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludCB1c2IzNTAzX3Jlc3VtZShzdHJ1Y3QgdXNi MzUwMyAqaHViKQogewotCWlmIChodWItPmNsaykKLQkJY2xrX3ByZXBhcmVfZW5hYmxlKGh1Yi0+ Y2xrKTsKLQorCWNsa19wcmVwYXJlX2VuYWJsZShodWItPmNsayk7CiAJdXNiMzUwM19zd2l0Y2hf bW9kZShodWIsIGh1Yi0+bW9kZSk7CiAKIAlyZXR1cm4gMDsK From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunfeng Yun Subject: [PATCH 3/5] usb: misc: usb3503: get optional clock by devm_clk_get_optional() Date: Sat, 30 Mar 2019 17:28:18 +0800 Message-ID: References: <2ec86ffd7de45dabaa7257019a79f1e80751934c.1553937592.git.chunfeng.yun@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <2ec86ffd7de45dabaa7257019a79f1e80751934c.1553937592.git.chunfeng.yun@mediatek.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Greg Kroah-Hartman Cc: Dongjin Kim , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Chunfeng Yun , linux-mediatek@lists.infradead.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org List-Id: linux-mediatek@lists.infradead.org Use devm_clk_get_optional() to get optional clock Cc: Dongjin Kim Signed-off-by: Chunfeng Yun --- drivers/usb/misc/usb3503.c | 48 ++++++++++++++------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c index d5141aa79dd4..72f39a9751b5 100644 --- a/drivers/usb/misc/usb3503.c +++ b/drivers/usb/misc/usb3503.c @@ -172,7 +172,6 @@ static int usb3503_probe(struct usb3503 *hub) hub->gpio_reset = pdata->gpio_reset; hub->mode = pdata->initial_mode; } else if (np) { - struct clk *clk; u32 rate = 0; hub->port_off_mask = 0; @@ -198,34 +197,29 @@ static int usb3503_probe(struct usb3503 *hub) } } - clk = devm_clk_get(dev, "refclk"); - if (IS_ERR(clk) && PTR_ERR(clk) != -ENOENT) { + hub->clk = devm_clk_get_optional(dev, "refclk"); + if (IS_ERR(hub->clk)) { dev_err(dev, "unable to request refclk (%ld)\n", - PTR_ERR(clk)); - return PTR_ERR(clk); + PTR_ERR(hub->clk)); + return PTR_ERR(hub->clk); } - if (!IS_ERR(clk)) { - hub->clk = clk; - - if (rate != 0) { - err = clk_set_rate(hub->clk, rate); - if (err) { - dev_err(dev, - "unable to set reference clock rate to %d\n", - (int) rate); - return err; - } - } - - err = clk_prepare_enable(hub->clk); + if (rate != 0) { + err = clk_set_rate(hub->clk, rate); if (err) { dev_err(dev, - "unable to enable reference clock\n"); + "unable to set reference clock rate to %d\n", + (int)rate); return err; } } + err = clk_prepare_enable(hub->clk); + if (err) { + dev_err(dev, "unable to enable reference clock\n"); + return err; + } + property = of_get_property(np, "disabled-ports", &len); if (property && (len / sizeof(u32)) > 0) { int i; @@ -324,8 +318,7 @@ static int usb3503_i2c_remove(struct i2c_client *i2c) struct usb3503 *hub; hub = i2c_get_clientdata(i2c); - if (hub->clk) - clk_disable_unprepare(hub->clk); + clk_disable_unprepare(hub->clk); return 0; } @@ -348,8 +341,7 @@ static int usb3503_platform_remove(struct platform_device *pdev) struct usb3503 *hub; hub = platform_get_drvdata(pdev); - if (hub->clk) - clk_disable_unprepare(hub->clk); + clk_disable_unprepare(hub->clk); return 0; } @@ -358,18 +350,14 @@ static int usb3503_platform_remove(struct platform_device *pdev) static int usb3503_suspend(struct usb3503 *hub) { usb3503_switch_mode(hub, USB3503_MODE_STANDBY); - - if (hub->clk) - clk_disable_unprepare(hub->clk); + clk_disable_unprepare(hub->clk); return 0; } static int usb3503_resume(struct usb3503 *hub) { - if (hub->clk) - clk_prepare_enable(hub->clk); - + clk_prepare_enable(hub->clk); usb3503_switch_mode(hub, hub->mode); return 0; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A9E0C43381 for ; Sat, 30 Mar 2019 09:28:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 54395218A3 for ; Sat, 30 Mar 2019 09:28:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iKL/I5/F" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54395218A3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=F9vHfLcvK4btGKggExCIvoKNwYkJiADx2UmT/CO2ZGc=; b=iKL/I5/FHyZXVp iwA2y2Id9TY8GTwPwbMvM1IRbMA5Q+w9ZyEj+ofNNAV+u1f83IKS3My35Snm68Tb9UwfWV/1sb2xV C/7Ml/Ofv6zpCeNEW4Qq2uHsDKit7Yb5lgbTgqaMmcSvPIiPHRcBUJUW8re3IQptakz5tu0ZHRq26 kD2yLUDbL8Eeongh6JXyIEpQQOVXopB3GClPjj35in3pjpeSkh9Hfq9l112TVhsqV099RfDAt8SJN tR4xaDNFG7aPjTZBS4Ei9j6aBME5aN8/23Ui+U/6Wyhv90NvuJhE6TrWxfz3yFVV998sc4mhypfjM B6EL/lW/LLGm46ztU0kA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hAAI4-00073X-AH; Sat, 30 Mar 2019 09:28:40 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hAAI1-00072v-4B; Sat, 30 Mar 2019 09:28:38 +0000 X-UUID: 2a84f7088eab4bf5bdd0e88d5d2e253c-20190330 X-UUID: 2a84f7088eab4bf5bdd0e88d5d2e253c-20190330 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 2127361937; Sat, 30 Mar 2019 01:28:35 -0800 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sat, 30 Mar 2019 02:28:34 -0700 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sat, 30 Mar 2019 17:28:32 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Sat, 30 Mar 2019 17:28:31 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman Subject: [PATCH 3/5] usb: misc: usb3503: get optional clock by devm_clk_get_optional() Date: Sat, 30 Mar 2019 17:28:18 +0800 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <2ec86ffd7de45dabaa7257019a79f1e80751934c.1553937592.git.chunfeng.yun@mediatek.com> References: <2ec86ffd7de45dabaa7257019a79f1e80751934c.1553937592.git.chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190330_022837_170818_1F15BDEB X-CRM114-Status: GOOD ( 11.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dongjin Kim , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Chunfeng Yun , linux-mediatek@lists.infradead.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use devm_clk_get_optional() to get optional clock Cc: Dongjin Kim Signed-off-by: Chunfeng Yun --- drivers/usb/misc/usb3503.c | 48 ++++++++++++++------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c index d5141aa79dd4..72f39a9751b5 100644 --- a/drivers/usb/misc/usb3503.c +++ b/drivers/usb/misc/usb3503.c @@ -172,7 +172,6 @@ static int usb3503_probe(struct usb3503 *hub) hub->gpio_reset = pdata->gpio_reset; hub->mode = pdata->initial_mode; } else if (np) { - struct clk *clk; u32 rate = 0; hub->port_off_mask = 0; @@ -198,34 +197,29 @@ static int usb3503_probe(struct usb3503 *hub) } } - clk = devm_clk_get(dev, "refclk"); - if (IS_ERR(clk) && PTR_ERR(clk) != -ENOENT) { + hub->clk = devm_clk_get_optional(dev, "refclk"); + if (IS_ERR(hub->clk)) { dev_err(dev, "unable to request refclk (%ld)\n", - PTR_ERR(clk)); - return PTR_ERR(clk); + PTR_ERR(hub->clk)); + return PTR_ERR(hub->clk); } - if (!IS_ERR(clk)) { - hub->clk = clk; - - if (rate != 0) { - err = clk_set_rate(hub->clk, rate); - if (err) { - dev_err(dev, - "unable to set reference clock rate to %d\n", - (int) rate); - return err; - } - } - - err = clk_prepare_enable(hub->clk); + if (rate != 0) { + err = clk_set_rate(hub->clk, rate); if (err) { dev_err(dev, - "unable to enable reference clock\n"); + "unable to set reference clock rate to %d\n", + (int)rate); return err; } } + err = clk_prepare_enable(hub->clk); + if (err) { + dev_err(dev, "unable to enable reference clock\n"); + return err; + } + property = of_get_property(np, "disabled-ports", &len); if (property && (len / sizeof(u32)) > 0) { int i; @@ -324,8 +318,7 @@ static int usb3503_i2c_remove(struct i2c_client *i2c) struct usb3503 *hub; hub = i2c_get_clientdata(i2c); - if (hub->clk) - clk_disable_unprepare(hub->clk); + clk_disable_unprepare(hub->clk); return 0; } @@ -348,8 +341,7 @@ static int usb3503_platform_remove(struct platform_device *pdev) struct usb3503 *hub; hub = platform_get_drvdata(pdev); - if (hub->clk) - clk_disable_unprepare(hub->clk); + clk_disable_unprepare(hub->clk); return 0; } @@ -358,18 +350,14 @@ static int usb3503_platform_remove(struct platform_device *pdev) static int usb3503_suspend(struct usb3503 *hub) { usb3503_switch_mode(hub, USB3503_MODE_STANDBY); - - if (hub->clk) - clk_disable_unprepare(hub->clk); + clk_disable_unprepare(hub->clk); return 0; } static int usb3503_resume(struct usb3503 *hub) { - if (hub->clk) - clk_prepare_enable(hub->clk); - + clk_prepare_enable(hub->clk); usb3503_switch_mode(hub, hub->mode); return 0; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel