From patchwork Tue Jul 19 11:32:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 72288 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp28441qga; Tue, 19 Jul 2016 04:33:11 -0700 (PDT) X-Received: by 10.66.26.105 with SMTP id k9mr65641698pag.103.1468927991059; Tue, 19 Jul 2016 04:33:11 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ue10si32366463pab.203.2016.07.19.04.33.09; Tue, 19 Jul 2016 04:33:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753386AbcGSLdH (ORCPT + 29 others); Tue, 19 Jul 2016 07:33:07 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:19952 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753009AbcGSLdF (ORCPT ); Tue, 19 Jul 2016 07:33:05 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id u6JBV8xG028548; Tue, 19 Jul 2016 20:31:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com u6JBV8xG028548 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1468927870; bh=c6LY4aZbVG1qMPIRuKJW+CupUU1AYPXLkJ5vwRAW7l4=; h=From:To:Cc:Subject:Date:From; b=jLQOr1IFWsgDX+xCT6/zVQUnr8XqF8EpHG+uf9TeBrMD0DuWeMeojKp5DvFz6r9se 90m3izFQMVDvqrF1IzLYbJ0ftUo7iG+0ewNIEB4axJJlrFdcX8iVx/OBBjze+1pyCT kaymIUhKMF7ZT8X2qWeusXbozfq94LZnTKj+F8zfhntz+PUv92owtNLYq24nokvFTX k/X5Ar0B10BNZYjMd/tNFI7kzOg1LGyNl0S6d91Z8Jcd6IXwuxfmTnrEwFpQKL+17h 7dBUZiuCfX/ushkxCBJaZSbUdaEyDysTkWWwYKGHZyJT9HAguGrdZNixAu/5K4B08l XWsjlX5xxEvng== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-usb@vger.kernel.org Cc: Hans de Goede , Philipp Zabel , Lee Jones , Masahiro Yamada , Alan Stern , linux-kernel@vger.kernel.org, Tony Prisk , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org Subject: [PATCH] usb: ehci-platform: switch over to shared reset Date: Tue, 19 Jul 2016 20:32:50 +0900 Message-Id: <1468927970-32240-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The recent update in the reset subsystem requires all reset consumers to be explicit when requesting reset lines. For detail, see the log of commit 3c35f6edc09b ("reset: Reorder inline reset_control_get*() wrappers"). The devm_reset_control_get_optional() is deprecated, and falls into the _exclusive variant during the migration, but the reset control in this driver is apparently shared-tolerate. Besides, this driver is for generic platforms, so actually should be able to work with a shared reset line. Signed-off-by: Masahiro Yamada --- drivers/usb/host/ehci-platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c index 1757ebb..2f5a16c 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -234,7 +234,7 @@ static int ehci_platform_probe(struct platform_device *dev) } } - priv->rst = devm_reset_control_get_optional(&dev->dev, NULL); + priv->rst = devm_reset_control_get_optional_shared(&dev->dev, NULL); if (IS_ERR(priv->rst)) { err = PTR_ERR(priv->rst); if (err == -EPROBE_DEFER)