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: [v4,2/6] usb: ohci-da8xx: let the regulator framework keep track of use count From: Bartosz Golaszewski Message-Id: <20190411093024.23555-3-brgl@bgdev.pl> Date: Thu, 11 Apr 2019 11:30:20 +0200 To: Sekhar Nori , Kevin Hilman , Alan Stern , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Bartosz Golaszewski List-ID: RnJvbTogQmFydG9zeiBHb2xhc3pld3NraSA8YmdvbGFzemV3c2tpQGJheWxpYnJlLmNvbT4KClRo ZXJlJ3Mgbm8gcmVhc29uIHRvIGhhdmUgYSBzZXBhcmF0ZSB2YXJpYWJsZSB0byBrZWVwIHRyYWNr IG9mIHRoZQpyZWd1bGF0b3Igc3RhdGUuIFRoZSByZWd1bGF0b3IgY29yZSBhbHJlYWR5IGRvZXMg dGhhdC4gUmVtb3ZlCnJlZ19lbmFibGVkIGZyb20gc3RydWN0IGRhOHh4X29oY2lfaGNkLgoKU2ln bmVkLW9mZi1ieTogQmFydG9zeiBHb2xhc3pld3NraSA8YmdvbGFzemV3c2tpQGJheWxpYnJlLmNv bT4KQWNrZWQtYnk6IEFsYW4gU3Rlcm4gPHN0ZXJuQHJvd2xhbmQuaGFydmFyZC5lZHU+Ci0tLQog ZHJpdmVycy91c2IvaG9zdC9vaGNpLWRhOHh4LmMgfCA4ICsrLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv dXNiL2hvc3Qvb2hjaS1kYTh4eC5jIGIvZHJpdmVycy91c2IvaG9zdC9vaGNpLWRhOHh4LmMKaW5k ZXggY2E4YTk0ZjE1YWMwLi4yMDlhMjYyYjU1NjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2hv c3Qvb2hjaS1kYTh4eC5jCisrKyBiL2RyaXZlcnMvdXNiL2hvc3Qvb2hjaS1kYTh4eC5jCkBAIC00 MCw3ICs0MCw2IEBAIHN0cnVjdCBkYTh4eF9vaGNpX2hjZCB7CiAJc3RydWN0IHBoeSAqdXNiMTFf cGh5OwogCXN0cnVjdCByZWd1bGF0b3IgKnZidXNfcmVnOwogCXN0cnVjdCBub3RpZmllcl9ibG9j ayBuYjsKLQl1bnNpZ25lZCBpbnQgcmVnX2VuYWJsZWQ7CiAJc3RydWN0IGdwaW9fZGVzYyAqdmJ1 c19ncGlvOwogCXN0cnVjdCBncGlvX2Rlc2MgKm9jX2dwaW87CiB9OwpAQCAtMTAwLDIxICs5OSwx OCBAQCBzdGF0aWMgaW50IG9oY2lfZGE4eHhfc2V0X3Bvd2VyKHN0cnVjdCB1c2JfaGNkICpoY2Qs IGludCBvbikKIAlpZiAoIWRhOHh4X29oY2ktPnZidXNfcmVnKQogCQlyZXR1cm4gMDsKIAotCWlm IChvbiAmJiAhZGE4eHhfb2hjaS0+cmVnX2VuYWJsZWQpIHsKKwlpZiAob24pIHsKIAkJcmV0ID0g cmVndWxhdG9yX2VuYWJsZShkYTh4eF9vaGNpLT52YnVzX3JlZyk7CiAJCWlmIChyZXQpIHsKIAkJ CWRldl9lcnIoZGV2LCAiRmFpbGVkIHRvIGVuYWJsZSByZWd1bGF0b3I6ICVkXG4iLCByZXQpOwog CQkJcmV0dXJuIHJldDsKIAkJfQotCQlkYTh4eF9vaGNpLT5yZWdfZW5hYmxlZCA9IDE7Ci0KLQl9 IGVsc2UgaWYgKCFvbiAmJiBkYTh4eF9vaGNpLT5yZWdfZW5hYmxlZCkgeworCX0gZWxzZSB7CiAJ CXJldCA9IHJlZ3VsYXRvcl9kaXNhYmxlKGRhOHh4X29oY2ktPnZidXNfcmVnKTsKIAkJaWYgKHJl dCkgewogCQkJZGV2X2VycihkZXYsICJGYWlsZWQgIHRvIGRpc2FibGUgcmVndWxhdG9yOiAlZFxu IiwgcmV0KTsKIAkJCXJldHVybiByZXQ7CiAJCX0KLQkJZGE4eHhfb2hjaS0+cmVnX2VuYWJsZWQg PSAwOwogCX0KIAogCXJldHVybiAwOwo= 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.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 3FF45C282DA for ; Thu, 11 Apr 2019 09:30:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F9AA20850 for ; Thu, 11 Apr 2019 09:30:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="EgQOslsc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727080AbfDKJag (ORCPT ); Thu, 11 Apr 2019 05:30:36 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:43794 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726106AbfDKJae (ORCPT ); Thu, 11 Apr 2019 05:30:34 -0400 Received: by mail-wr1-f67.google.com with SMTP id k17so1698810wrx.10 for ; Thu, 11 Apr 2019 02:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=joOQiQILwSUQpc0pTrHcK/ya5VvWQmcmFsscTsVp5Yw=; b=EgQOslscCdg9QNMZU/Bmy89sWYhpPCz71b3AUgk9nLqxNHNg1pI/E5AN+sMPGwj0no dLLWajdIxgW6ZXMt0sD9MPDdhZey85TqREKHcEoQ5dItHGElCuMk+LDOKuV0CiuYAS3Z qx0krI14O7/bgOxhziDK099EixwkG4mR7RvOaXhf8yz/FGfnzV9o1QRcXvGpBpm9HvKN QlkJJ+JuuKpMyz4xOoSW03IcBBKcAz/HV9yKR4VnkBh4QcItjeS181kTJAURjl1ruz6A fkRxdxAgWImttXyvzhGfBpaEkZfdasotYPRLd/S7Pk19gH2BqHsm+Y1HzgRQ45Xgmfo9 K3ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=joOQiQILwSUQpc0pTrHcK/ya5VvWQmcmFsscTsVp5Yw=; b=h5Ps9c/fxQMV3iVRkYhB58XgliLshLiwfsxGO4F0AsZTWIKPnyc0d31dXXBgoDdl5o 8XY2yxtyxGMTrYS8RLxW05CAD/rHI5yntNbrNfroEBMZnNrdCUpnQ0ISWbN8fdQQ2Wxr ho/u0KDwPgLxCWqLMzey7C4n58EAa89apsj+0I+c4+DvjtkdU/ukgwkZNmnY7UgKiZ0h p1cKgdkSq7xMkc4G0SH5dRIZcBGZG5sZ0pocia6PoDSjBAtMSLT1zFKj1ooxRB+wWyxk 5gxqzB7NIMqd6S2uYZ6nTrmEFzL/kxE4SJezziQexpJd2Dw8Mu8SG28XrJTDlZNT5ZIv 8hzA== X-Gm-Message-State: APjAAAWcrRIGyrXxrh39OUlGT/ufGNfu8FPT3/ljkvX5uM+xEUySic3k HkEdio/fGpHBSkyLgT4Bi7blng== X-Google-Smtp-Source: APXvYqyUOAE+neN/xsO+xoLZUe6zOOYX4bRL3Bf0Vlw1KF3Q1rQEfh4MaSvn1jgF2DVc2WcCsdXfAw== X-Received: by 2002:a5d:6988:: with SMTP id g8mr30852625wru.117.1554975032038; Thu, 11 Apr 2019 02:30:32 -0700 (PDT) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id a9sm37517228wrt.29.2019.04.11.02.30.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 02:30:31 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Alan Stern , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v4 2/6] usb: ohci-da8xx: let the regulator framework keep track of use count Date: Thu, 11 Apr 2019 11:30:20 +0200 Message-Id: <20190411093024.23555-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190411093024.23555-1-brgl@bgdev.pl> References: <20190411093024.23555-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID: <20190411093020.OMKEmh2G-fSqT6jC8FL1oiCixwCpdrxIOEK9wabps38@z> From: Bartosz Golaszewski There's no reason to have a separate variable to keep track of the regulator state. The regulator core already does that. Remove reg_enabled from struct da8xx_ohci_hcd. Signed-off-by: Bartosz Golaszewski Acked-by: Alan Stern --- drivers/usb/host/ohci-da8xx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index ca8a94f15ac0..209a262b5565 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -40,7 +40,6 @@ struct da8xx_ohci_hcd { struct phy *usb11_phy; struct regulator *vbus_reg; struct notifier_block nb; - unsigned int reg_enabled; struct gpio_desc *vbus_gpio; struct gpio_desc *oc_gpio; }; @@ -100,21 +99,18 @@ static int ohci_da8xx_set_power(struct usb_hcd *hcd, int on) if (!da8xx_ohci->vbus_reg) return 0; - if (on && !da8xx_ohci->reg_enabled) { + if (on) { ret = regulator_enable(da8xx_ohci->vbus_reg); if (ret) { dev_err(dev, "Failed to enable regulator: %d\n", ret); return ret; } - da8xx_ohci->reg_enabled = 1; - - } else if (!on && da8xx_ohci->reg_enabled) { + } else { ret = regulator_disable(da8xx_ohci->vbus_reg); if (ret) { dev_err(dev, "Failed to disable regulator: %d\n", ret); return ret; } - da8xx_ohci->reg_enabled = 0; } return 0; -- 2.21.0