From patchwork Sat Apr 14 13:06:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 10341209 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 2F28A60542 for ; Sat, 14 Apr 2018 13:06:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F90028A83 for ; Sat, 14 Apr 2018 13:06:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 142B828A87; Sat, 14 Apr 2018 13:06:56 +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 D6D0A28A8B for ; Sat, 14 Apr 2018 13:06:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751075AbeDNNGv (ORCPT ); Sat, 14 Apr 2018 09:06:51 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:41345 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750883AbeDNNGs (ORCPT ); Sat, 14 Apr 2018 09:06:48 -0400 Received: by mail-lf0-f68.google.com with SMTP id o102-v6so16066458lfg.8; Sat, 14 Apr 2018 06:06:47 -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=1u0h7NmqahZQSXvnVaksaO/NnA7i42VqkFxyNTkqdDQ=; b=Tkp/JNjD5y+/M/q+pqkZysaMdpvZTXJGPuZHmh1TpAxlHctrbJNn+36rWaf9XlN8Vx oENcaeGj/Tp9gvDsO0IyJpNTO9AuHVpDR1wjear/G2JtkDxRWv/bFNuQ5+2KHrLfOZVN aTQ1Fa1Ta/y/JyF2IoiunBZG9UqdLdYjQ6XBw900GmPJ2/RgPWtLWyYI0ldH+7QBiCtA veV202kRtzP8o3SIcdQJUyfcV2qymeJU/PNFEhIsvXrlslSgHaoa1nW+tg0HlbFTGHeY 2RMbHG4852xhAZfJZ12uxWcwmu/QKVtki9K70kJbgYhijWMu04qd6OR+udSm7QL8NIHF ZKXQ== 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=1u0h7NmqahZQSXvnVaksaO/NnA7i42VqkFxyNTkqdDQ=; b=B9gqjSzyNomNWcCTQkKXOTnR259wEOk8k5qC8glMk4jLYmok9QnQq112YUAtxM+EnU xH3j5tS9WrWnJFgXtYOa4mbQ6y2MuTQEWFyK6g7xNGL/VS+47mFRFdsSHnCnO4qdO8/2 IB8DYCLZ8wjo0oPcPSB2ZdUeY62UWwMEuIcEsQIM40v/JsPMcJLy1uWiQArDIIweM/Bk VzCBVNcUn2DQ2/BX1YbdVClU4/dZ/dguQck8vMMptV6torzhYKKmA7I2tyXdUbd3c9A2 xhjuxtiUGzmj2Rh2olZLmBQpvWfc+bkJRCicnv0UYBA+q2Jmk4CKuolL+cBQC5/3I6u3 ag/A== X-Gm-Message-State: ALQs6tBkGmIYnaxUR69W5iAZcYEm6dYaPlJ2yWHGwCwsbkfNAFyvOZgi t1dOvnJgME4jf+JloFoU2oo= X-Google-Smtp-Source: AIpwx4+oI/lD8jfTVv0wlSK6iskFgNfrw9LxWdER+l7LTPMjHpEVnX++uATgSjLJbrX+RN55SAelxA== X-Received: by 2002:a19:9c0d:: with SMTP id f13-v6mr10424948lfe.9.1523711206639; Sat, 14 Apr 2018 06:06:46 -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 d24-v6sm1748028lfc.51.2018.04.14.06.06.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Apr 2018 06:06:43 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.90_1) (envelope-from ) id 1f7Kt5-00064B-Qz; Sat, 14 Apr 2018 15:06:39 +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, Johan Hovold Subject: [PATCH 5/6] USB: renesas_usbhs: drop support for legacy phys Date: Sat, 14 Apr 2018 15:06:17 +0200 Message-Id: <20180414130618.23249-6-johan@kernel.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180414130618.23249-1-johan@kernel.org> References: <20180414130618.23249-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 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. Signed-off-by: Johan Hovold Acked-by: Yoshihiro Shimoda --- 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; }