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_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 20DD5C10F0E for ; Tue, 9 Apr 2019 08:29:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2A2F2133D for ; Tue, 9 Apr 2019 08:29:35 +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="bXDBK1K3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726913AbfDII3e (ORCPT ); Tue, 9 Apr 2019 04:29:34 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33260 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726735AbfDII3E (ORCPT ); Tue, 9 Apr 2019 04:29:04 -0400 Received: by mail-wr1-f68.google.com with SMTP id q1so19704532wrp.0 for ; Tue, 09 Apr 2019 01:29:03 -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=15DBa0EnjSNcBoiq7HFAstm0qdeH35lSsLh5PK7xiEg=; b=bXDBK1K3t0svttcv9jzP3GIIt6Gp35JiLi41MrbUFQno0+Nwszgq72uurXsqJCPFih 7NoFGvr5wge0VotCbiKB8m3QEx4gHpEbKZM2dHNoYU/Dr5IoPU6yi9LXmupyBgEVngXG gM4LxsrTetEPUwDc0RJeWTi+sHs5558quvMOyPfzZNDb8VuLqVYvrOwyQYiKyXbbcJRX +He54ul9Me+HdbYUxs3A+mxGc3OmFf26gMDggJ9fAFKtwaQOjCzLKloZtWaHByBF96An 6Pt+WyQpaVDzCn3t5vBcQVQDxjIZR+OTujyWQp5IFr9ZgfZ52c6DmoWQjF5L+Sa3fG/j 2OMg== 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=15DBa0EnjSNcBoiq7HFAstm0qdeH35lSsLh5PK7xiEg=; b=S5qI7/1G3EIDHk+/Mpvm001mVikAtGd9z/UNKa5h+7a+6HKaEuMyeFrYKWZ8MaBoO/ 6ydvdrdDAc7mz6DGEA9OXZNKo40Q9oEm+OsKU47XGYQuLX2q0HScfl0z2+40qAntzPvq vJkRuE8uE234UseJnKDlk1yF/zbWyb5C3ei0AGoAsmR+inOfAw7tMO7hBkWQh3gTrpNM KSHMou/y9gDt5rnitVP4bh9KrEYfGPKSWvbQr6AeCqh0zwg8pwVuYiVFGNsPdH0z+Tzq ZFufvBV0DqNMWLN2WcIP6/C/4sDcKNtHm4c2L6rFVY/hPWBL26VQAfsSbzcbjT5wfBHE rIYg== X-Gm-Message-State: APjAAAX/9m14gowbDGmf9y56dsNFbfVamnqj0yny6PgyIS8xEIg7oFUA FiJBdQYLR+w8fSQVu0UL10ebMw== X-Google-Smtp-Source: APXvYqyEihnGv12APLf6JtqE+drrm3qzq2sqhdNZtGeoavhnovnlsL84rkYx2+L4c0gMbIkVC8NbvQ== X-Received: by 2002:adf:cf0e:: with SMTP id o14mr21087198wrj.182.1554798542702; Tue, 09 Apr 2019 01:29:02 -0700 (PDT) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id c20sm59968651wre.28.2019.04.09.01.29.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 01:29:02 -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 v3 2/6] usb: ohci-da8xx: let the regulator framework keep track of use count Date: Tue, 9 Apr 2019 10:28:51 +0200 Message-Id: <20190409082855.15373-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190409082855.15373-1-brgl@bgdev.pl> References: <20190409082855.15373-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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..9c6d1f03b871 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 if (!on) { 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