From patchwork Fri Apr 13 15:15:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 10340273 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9D37C6039A for ; Fri, 13 Apr 2018 15:18:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CBA928904 for ; Fri, 13 Apr 2018 15:18:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7164B28906; Fri, 13 Apr 2018 15:18:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F089728904 for ; Fri, 13 Apr 2018 15:18:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752007AbeDMPR5 (ORCPT ); Fri, 13 Apr 2018 11:17:57 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35145 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750960AbeDMPRR (ORCPT ); Fri, 13 Apr 2018 11:17:17 -0400 Received: by mail-lf0-f67.google.com with SMTP id b189-v6so13149669lfe.2; Fri, 13 Apr 2018 08:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EsaRa0Aant2MUpU1kh4Cc4uulHMR0FcVDZsDEjPOjR0=; b=b//J/14UpMJXMfqqfhvpM96GMiYzd2ItOyiloO3qvAIo2hXMoqXoy6+7uX/pcb8yLd Uh02cnUmWmcBzeTHkOA5yPPFYJKC+gCdqCwUgCQxrlohn3S9yNPkgArInLoxOHdcmxOx bBDAU4ZAd9IC7DfnJClbknetsKzud4lipOsz27BLLhQH5N0w94wBjjcUADAa6WU7U+ZX pumrMfakMHgEimw67JYR6+zv8ekEQQrB9vruoyAdTnSpgx3n0yGtOocOfnoyz+5wzB7Y xa39LJr43wj5jOrUvss799AmnpnluP3GAoq5HdizPAvQf0VCyp3yT+99Oth1eTc6TwS4 EhtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EsaRa0Aant2MUpU1kh4Cc4uulHMR0FcVDZsDEjPOjR0=; b=ETStv9he4b419yaAABYq56j/7RW3k3N9g2cBsKXZfpRwE+ESKMSSq4HTESjIa4/ICE v4znOWj42yq2KQt3W6bVwIiWlanDaXEYHjs3kRjMHE27FRROTEsCEPYqlEq811rucbv5 VptjlWOPfZavuYDnQNMWAKs9RMGegUanZx8kNrNcwC+CH9Diw4L7APYeHENDO172t6aE pyEX71ofasT+dz/jU+a+gHWwM91oql3vc/emDikVE4Z8r+VrENPrqzkSXyh+yef/mXi6 bYhqXB8Ufc49zm9kFr5OKljfWDBD79dFrGT8agVDfQjMLXHkWrA4gNHorbvGBZP1/Zax Ol2g== X-Gm-Message-State: ALQs6tA+VzNKRZqgmzkzCJNZ/KKHv7+2ob6Sr9vEv/ELxaVjYDYf1+07 08H82IxupK5HBX1WtFZA5Ck= X-Google-Smtp-Source: AIpwx4+mP2K7TTtG3ul5vXDjZ+ED4Yy+QjiKqA+0Gb0WF0y+b0m/fqfxTA5vw20fgXTiqOoGq3CXJw== X-Received: by 10.46.152.18 with SMTP id a18mr3509623ljj.34.1523632636250; Fri, 13 Apr 2018 08:17:16 -0700 (PDT) Received: from xi.terra (c-8bb2e655.07-184-6d6c6d4.cust.bredbandsbolaget.se. [85.230.178.139]) by smtp.gmail.com with ESMTPSA id r6sm1015240ljh.55.2018.04.13.08.17.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 08:17:13 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.90_1) (envelope-from ) id 1f70Rp-0008Vs-Ve; Fri, 13 Apr 2018 17:17:09 +0200 From: Johan Hovold To: Bin Liu Cc: Greg Kroah-Hartman , Alan Stern , Arnd Bergmann , Kishon Vijay Abraham I , Martin Blumenstingl , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Subject: [PATCH 1/3] USB: musb: dsps: drop duplicate phy initialisation Date: Fri, 13 Apr 2018 17:15:03 +0200 Message-Id: <20180413151505.32663-2-johan@kernel.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180413151505.32663-1-johan@kernel.org> References: <20180413151505.32663-1-johan@kernel.org> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit 39cee200c23e ("usb: musb: core: call init and shutdown for the usb phy") the musb USB phy is initialised by musb_core, but the original initialisation in the dsps-glue init callback was left in place resulting in two calls to phy init during probe (and similarly, two shutdowns on remove). Drop the duplicate phy init and shutdown calls from the dsps glue in favour of the ones in musb core, which other glue drivers rely on. Note however that any generic phy is still initialised in the glue init callback (just as for the other drivers). Cc: Uwe Kleine-König Signed-off-by: Johan Hovold Acked-by: Uwe Kleine-König --- drivers/usb/musb/musb_dsps.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c index 05a679d5e3a2..6a60bc0490c5 100644 --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@ -451,7 +451,6 @@ static int dsps_musb_init(struct musb *musb) if (!rev) return -ENODEV; - usb_phy_init(musb->xceiv); if (IS_ERR(musb->phy)) { musb->phy = NULL; } else { @@ -501,7 +500,6 @@ static int dsps_musb_exit(struct musb *musb) struct dsps_glue *glue = dev_get_drvdata(dev->parent); del_timer_sync(&musb->dev_timer); - usb_phy_shutdown(musb->xceiv); phy_power_off(musb->phy); phy_exit(musb->phy); debugfs_remove_recursive(glue->dbgfs_root);