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: [v2,1/6] usb: xhci-mtk: get optional clock by devm_clk_get_optional() From: Greg Kroah-Hartman Message-Id: <20190416101506.GB26091@kroah.com> Date: Tue, 16 Apr 2019 12:15:06 +0200 To: Chunfeng Yun Cc: Mathias Nyman , Matthias Brugger , Marek Szyprowski , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org List-ID: T24gV2VkLCBBcHIgMTAsIDIwMTkgYXQgMDI6NDc6MjRQTSArMDgwMCwgQ2h1bmZlbmcgWXVuIHdy b3RlOgo+IFVzZSBkZXZtX2Nsa19nZXRfb3B0aW9uYWwoKSB0byBnZXQgb3B0aW9uYWwgY2xvY2sK PiAKPiBTaWduZWQtb2ZmLWJ5OiBDaHVuZmVuZyBZdW4gPGNodW5mZW5nLnl1bkBtZWRpYXRlay5j b20+Cj4gLS0tCj4gdjI6IG5vIGNoYW5nZXMKPiAtLS0KPiAgZHJpdmVycy91c2IvaG9zdC94aGNp LW10ay5jIHwgMTkgKysrLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMyBpbnNl cnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2Iv aG9zdC94aGNpLW10ay5jIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLW10ay5jCj4gaW5kZXggNjA5 ODdjNzg3ZTQ0Li4wMjZmZTE4OTcyZDMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2IvaG9zdC94 aGNpLW10ay5jCj4gKysrIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLW10ay5jCj4gQEAgLTIwNiwx OSArMjA2LDYgQEAgc3RhdGljIGludCB4aGNpX210a19zc3VzYl9jb25maWcoc3RydWN0IHhoY2lf aGNkX210ayAqbXRrKQo+ICAJcmV0dXJuIHhoY2lfbXRrX2hvc3RfZW5hYmxlKG10ayk7Cj4gIH0K PiAgCj4gLS8qIGlnbm9yZSB0aGUgZXJyb3IgaWYgdGhlIGNsb2NrIGRvZXMgbm90IGV4aXN0ICov Cj4gLXN0YXRpYyBzdHJ1Y3QgY2xrICpvcHRpb25hbF9jbGtfZ2V0KHN0cnVjdCBkZXZpY2UgKmRl diwgY29uc3QgY2hhciAqaWQpCj4gLXsKPiAtCXN0cnVjdCBjbGsgKm9wdF9jbGs7Cj4gLQo+IC0J b3B0X2NsayA9IGRldm1fY2xrX2dldChkZXYsIGlkKTsKPiAtCS8qIGlnbm9yZSBlcnJvciBudW1i ZXIgZXhjZXB0IEVQUk9CRV9ERUZFUiAqLwo+IC0JaWYgKElTX0VSUihvcHRfY2xrKSAmJiAoUFRS X0VSUihvcHRfY2xrKSAhPSAtRVBST0JFX0RFRkVSKSkKPiAtCQlvcHRfY2xrID0gTlVMTDsKPiAt Cj4gLQlyZXR1cm4gb3B0X2NsazsKPiAtfQo+IC0KPiAgc3RhdGljIGludCB4aGNpX210a19jbGtz X2dldChzdHJ1Y3QgeGhjaV9oY2RfbXRrICptdGspCj4gIHsKPiAgCXN0cnVjdCBkZXZpY2UgKmRl diA9IG10ay0+ZGV2Owo+IEBAIC0yMjksMTUgKzIxNiwxNSBAQCBzdGF0aWMgaW50IHhoY2lfbXRr X2Nsa3NfZ2V0KHN0cnVjdCB4aGNpX2hjZF9tdGsgKm10aykKPiAgCQlyZXR1cm4gUFRSX0VSUiht dGstPnN5c19jbGspOwo+ICAJfQo+ICAKPiAtCW10ay0+cmVmX2NsayA9IG9wdGlvbmFsX2Nsa19n ZXQoZGV2LCAicmVmX2NrIik7Cj4gKwltdGstPnJlZl9jbGsgPSBkZXZtX2Nsa19nZXRfb3B0aW9u YWwoZGV2LCAicmVmX2NrIik7Cj4gIAlpZiAoSVNfRVJSKG10ay0+cmVmX2NsaykpCj4gIAkJcmV0 dXJuIFBUUl9FUlIobXRrLT5yZWZfY2xrKTsKPiAgCj4gLQltdGstPm1jdV9jbGsgPSBvcHRpb25h bF9jbGtfZ2V0KGRldiwgIm1jdV9jayIpOwo+ICsJbXRrLT5tY3VfY2xrID0gZGV2bV9jbGtfZ2V0 X29wdGlvbmFsKGRldiwgIm1jdV9jayIpOwo+ICAJaWYgKElTX0VSUihtdGstPm1jdV9jbGspKQo+ ICAJCXJldHVybiBQVFJfRVJSKG10ay0+bWN1X2Nsayk7Cj4gIAo+IC0JbXRrLT5kbWFfY2xrID0g b3B0aW9uYWxfY2xrX2dldChkZXYsICJkbWFfY2siKTsKPiArCW10ay0+ZG1hX2NsayA9IGRldm1f Y2xrX2dldF9vcHRpb25hbChkZXYsICJkbWFfY2siKTsKCkFsc28sIG5vdyB0aGF0IHRoaXMgY2xv Y2sgKGFuZCB0aGUgb3RoZXJzIGhlcmUpIGFyZSBjb250cm9sbGVkIGJ5IHRoZQpkZXZtIGluZnJh c3RydWN0dXJlLCBkbyB5b3UgaGF2ZSB0byBjaGFuZ2Ugd2hlbiB5b3Ugd2VyZSBjbGVhbmluZyB1 cCBhbmQKc3RvcHBpbmcgdGhlIGNsb2NrPyAgVGhhdCBsb2dpYyBzZWVtcyB0byBiZSB0aGUgc2Ft ZSBoZXJlLCB3aGljaCBkb2VzCm5vdCBzZWVtIHRvIGJlIGNvcnJlY3QgdG8gbWUuCgpQbGVhc2Ug YWxzbyBkb2N1bWVudCB0aGF0IGluIHlvdXIgY2hhbmdlbG9nIGNvbW1lbnRzIHdoZW4gcmVzZW5k aW5nIHRoaXMKc2VyaWVzLCBhcyBhbGwgb2YgdGhlc2UgcGF0Y2hlcyBoYXZlIHRoaXMgaXNzdWUg YXMgd2VsbC4KCnRoYW5rcywKCmdyZWcgay1oCg== 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=-8.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_MUTT 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 AE88AC10F14 for ; Tue, 16 Apr 2019 10:38:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8086520872 for ; Tue, 16 Apr 2019 10:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555411135; bh=dTCLOqJLgmceBABnPOvGU4HocMxOvoBRx6rxgvFEg5Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=KxXjHrwFamxy68vRQ8b6L7ikHilQ0Kai9EoB6Zxk7gizvSGWwveDC0NfkHLJzlnXQ jVmd26zHewKpBtlowKpPWjTmvQL6H5Uf7NT+2PM139v30ubTTW3B8rIjaTji+lvTeq kBnOqeDI+JpKS8fHER0Botindpf3f8AvEHJNlu4s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729097AbfDPKit (ORCPT ); Tue, 16 Apr 2019 06:38:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:57404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727950AbfDPKit (ORCPT ); Tue, 16 Apr 2019 06:38:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E827C217F9; Tue, 16 Apr 2019 10:38:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555411128; bh=dTCLOqJLgmceBABnPOvGU4HocMxOvoBRx6rxgvFEg5Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=q5bnxMleBXFUsq09ydLundcgYmmQMNKEtu702h+yRvUK5s810++ExYJxgNzvSs9Q4 ifkOcVlVknrbWaN+Oh7LtULvk+/D0YwuUoX0c1PuReuQhg98B20vGbHM+3Yzf/C4e6 x9omnw3aesCeC7vFYC4vUcYAr3niLarEGI3sHjzc= Date: Tue, 16 Apr 2019 12:15:06 +0200 From: Greg Kroah-Hartman To: Chunfeng Yun Cc: Mathias Nyman , Matthias Brugger , Marek Szyprowski , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: Re: [v2 PATCH 1/6] usb: xhci-mtk: get optional clock by devm_clk_get_optional() Message-ID: <20190416101506.GB26091@kroah.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Message-ID: <20190416101506.Q1N0Wef6kAWQMzx7WxjF3ddlsrHuETRb5muONm_8VJU@z> On Wed, Apr 10, 2019 at 02:47:24PM +0800, Chunfeng Yun wrote: > Use devm_clk_get_optional() to get optional clock > > Signed-off-by: Chunfeng Yun > --- > v2: no changes > --- > drivers/usb/host/xhci-mtk.c | 19 +++---------------- > 1 file changed, 3 insertions(+), 16 deletions(-) > > diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c > index 60987c787e44..026fe18972d3 100644 > --- a/drivers/usb/host/xhci-mtk.c > +++ b/drivers/usb/host/xhci-mtk.c > @@ -206,19 +206,6 @@ static int xhci_mtk_ssusb_config(struct xhci_hcd_mtk *mtk) > return xhci_mtk_host_enable(mtk); > } > > -/* ignore the error if the clock does not exist */ > -static struct clk *optional_clk_get(struct device *dev, const char *id) > -{ > - struct clk *opt_clk; > - > - opt_clk = devm_clk_get(dev, id); > - /* ignore error number except EPROBE_DEFER */ > - if (IS_ERR(opt_clk) && (PTR_ERR(opt_clk) != -EPROBE_DEFER)) > - opt_clk = NULL; > - > - return opt_clk; > -} > - > static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk) > { > struct device *dev = mtk->dev; > @@ -229,15 +216,15 @@ static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk) > return PTR_ERR(mtk->sys_clk); > } > > - mtk->ref_clk = optional_clk_get(dev, "ref_ck"); > + mtk->ref_clk = devm_clk_get_optional(dev, "ref_ck"); > if (IS_ERR(mtk->ref_clk)) > return PTR_ERR(mtk->ref_clk); > > - mtk->mcu_clk = optional_clk_get(dev, "mcu_ck"); > + mtk->mcu_clk = devm_clk_get_optional(dev, "mcu_ck"); > if (IS_ERR(mtk->mcu_clk)) > return PTR_ERR(mtk->mcu_clk); > > - mtk->dma_clk = optional_clk_get(dev, "dma_ck"); > + mtk->dma_clk = devm_clk_get_optional(dev, "dma_ck"); Also, now that this clock (and the others here) are controlled by the devm infrastructure, do you have to change when you were cleaning up and stopping the clock? That logic seems to be the same here, which does not seem to be correct to me. Please also document that in your changelog comments when resending this series, as all of these patches have this issue as well. thanks, greg k-h