From patchwork Wed Apr 18 09:26:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 10347641 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 AAD8860244 for ; Wed, 18 Apr 2018 09:27:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A50E01FEBA for ; Wed, 18 Apr 2018 09:27:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97EBD223C7; Wed, 18 Apr 2018 09:27:37 +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 0C5DD1FEBA for ; Wed, 18 Apr 2018 09:27:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753239AbeDRJ1e (ORCPT ); Wed, 18 Apr 2018 05:27:34 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35760 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753050AbeDRJ1b (ORCPT ); Wed, 18 Apr 2018 05:27:31 -0400 Received: by mail-lf0-f68.google.com with SMTP id r125-v6so1603840lfe.2; Wed, 18 Apr 2018 02:27:30 -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; bh=7NUy89Zy7CsQLxQ3Z1OfC8ROJdMX3r0U/hxiVGIBhoY=; b=kGrMWmhJBoMgINKhipw7OyewTvRwSZb3MOlXXjfAkX995XxrkAFw/8oFRgzWQcMtf7 FB0Qgp3SGX3jdSPmsf44aUcOhGXxZiYsavO169G/NcyKUWlq1/r5P/0o4qPC442QqH/n qiUVg5Vp6oJjBP10lNvKVXtofjyGuPfoLjc+soaJdXDxMyJwJRQg+bCzgZAvybuRQBqv fbxl3soCmwb4qPQoSNmZQptZ764JjgEgG57KPUH8aEU1x3dbuwjR6YCBnp4PO7GzjsrZ k1w8jULRE00QR6W3yfARVN/2LBV9uJ0rbndK0vM95YZ8BsrZT8+TD8u53Z0lBl+pGyhb CZsQ== 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; bh=7NUy89Zy7CsQLxQ3Z1OfC8ROJdMX3r0U/hxiVGIBhoY=; b=g+hiWkITMs+biyh9Pj3a9lIDUMEVBrliwWNbZiY90a271Mi6CsCO+DGAA7Yse7ljzl R6f7YbIYHU77wD96N2h8KvmGd7hOj7tWk26Y4ogNxZ8SuMacGd1zto69P3E64SuHDVav HuBnuYNy7wWhj68FT/ehtsxzeQ9f+5ct63MTQqUlsLlRL7rijxW3m514ylAk12S0q0g2 8Jq486ujzT/puNdN4J1OjS9LN9yIBMyqpEAVl8NyHEIDhyPyuMSs1CiH2rsTivk8D8Vl KUY+lL9LsJGkzig4zMlHGf73e2LuIwM0Hz7Q6+EwhHGbWul/noVGQuX81tWiz6bIBxAe PCYw== X-Gm-Message-State: ALQs6tBI+eRMq/hK9MJewyL3hpI+8fkuVbwsiV+qFNbHaz9KJonFlqOS PGQ0ZAJY1M8FZminWbLJi10= X-Google-Smtp-Source: AIpwx4/g/5vZDwoFR1a8Sp+idnuLhL91vnR51LckG2deZ30rLzSB2OOGBej4G9dOR6GFLeYRzujSqg== X-Received: by 2002:a19:93ce:: with SMTP id w75-v6mr1048108lfk.38.1524043650167; Wed, 18 Apr 2018 02:27:30 -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 l22sm129087lja.62.2018.04.18.02.27.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 02:27:28 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.90_1) (envelope-from ) id 1f8jN7-0003Eg-Hy; Wed, 18 Apr 2018 11:27:25 +0200 From: Johan Hovold To: Greg Kroah-Hartman , Felipe Balbi Cc: Alan Stern , Bin Liu , linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, Yoshihiro Shimoda , Johan Hovold Subject: [PATCH v2 5/6] USB: renesas_usbhs: drop unused legacy-phy support Date: Wed, 18 Apr 2018 11:26:23 +0200 Message-Id: <20180418092624.12361-6-johan@kernel.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180418092624.12361-1-johan@kernel.org> References: <20180418092624.12361-1-johan@kernel.org> 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 Drop support for legacy phys for rcar2 which hasn't been used with a mainline kernel since commit 9080b8dc761a ("ARM: OMAP2+: Remove legacy usb-host.c platform init code"). Specifically, since that commit usb_get_phy_dev() have always returned -ENODEV and consequently this code has not been used. Note that the legacy-phy API is still being used in gadget mode to bind the peripheral controller. Acked-by: Yoshihiro Shimoda Signed-off-by: Johan Hovold --- drivers/usb/renesas_usbhs/common.h | 1 - drivers/usb/renesas_usbhs/rcar2.c | 29 ----------------------------- 2 files changed, 30 deletions(-) diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h index f619afeae2b8..6137f7942c05 100644 --- a/drivers/usb/renesas_usbhs/common.h +++ b/drivers/usb/renesas_usbhs/common.h @@ -276,7 +276,6 @@ struct usbhs_priv { */ struct usbhs_fifo_info fifo_info; - struct usb_phy *usb_phy; struct phy *phy; }; diff --git a/drivers/usb/renesas_usbhs/rcar2.c b/drivers/usb/renesas_usbhs/rcar2.c index 85a0e0933917..0027092b1118 100644 --- a/drivers/usb/renesas_usbhs/rcar2.c +++ b/drivers/usb/renesas_usbhs/rcar2.c @@ -8,7 +8,6 @@ #include #include #include -#include #include "common.h" #include "rcar2.h" @@ -26,16 +25,6 @@ static int usbhs_rcar2_hardware_init(struct platform_device *pdev) return 0; } - if (IS_ENABLED(CONFIG_USB_PHY)) { - struct usb_phy *usb_phy = usb_get_phy_dev(&pdev->dev, 0); - - if (IS_ERR(usb_phy)) - return PTR_ERR(usb_phy); - - priv->usb_phy = usb_phy; - return 0; - } - return -ENXIO; } @@ -48,11 +37,6 @@ static int usbhs_rcar2_hardware_exit(struct platform_device *pdev) priv->phy = NULL; } - if (priv->usb_phy) { - usb_put_phy(priv->usb_phy); - priv->usb_phy = NULL; - } - return 0; } @@ -75,19 +59,6 @@ static int usbhs_rcar2_power_ctrl(struct platform_device *pdev, } } - if (priv->usb_phy) { - if (enable) { - retval = usb_phy_init(priv->usb_phy); - - if (!retval) - retval = usb_phy_set_suspend(priv->usb_phy, 0); - } else { - usb_phy_set_suspend(priv->usb_phy, 1); - usb_phy_shutdown(priv->usb_phy); - retval = 0; - } - } - return retval; }