From patchwork Tue Nov 8 18:57:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 9417969 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 C099E60459 for ; Tue, 8 Nov 2016 19:00:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B33E0289CB for ; Tue, 8 Nov 2016 19:00:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A75F8289CC; Tue, 8 Nov 2016 19:00:53 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 385C7289CE for ; Tue, 8 Nov 2016 19:00:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c4Bc7-0002Ka-PL; Tue, 08 Nov 2016 18:59:19 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c4Bas-0001VU-EV for linux-arm-kernel@lists.infradead.org; Tue, 08 Nov 2016 18:58:04 +0000 Received: by mail-wm0-x22c.google.com with SMTP id p190so265118949wmp.1 for ; Tue, 08 Nov 2016 10:57:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jMJhjmNJRTxwAAYFcoaiuKWGw7C5rkWRptWqQkRpQEw=; b=L52tSTHUw/yz8qpopV6MGusppGUCOvWIxXPaFoqNtUcSLnES/RbZbtQS+fPJLfi5qD VovWNFBsADaF+GJXlwEts7Xn6jw2TSlISJtSgHGryG8wun2rpSn3pSCuH1LwpYd6XjT6 R1Jd7VmGc1XvFaXJ9/Qh2l1sDSHeAar0p/3IftoL44rYl/P3h65ea/c0JvAxr5BD3xZw 8wxsE76ubFCayclaINqlDGZ/cdtSvFNSMgwvB20iEe6it+PI+FVvR7C5pyWKtE9HSa0P idV+0qWBdhZPHdg6zJKMsRIFwhTocMZXYRMJQ9uRQhhYrxiyFxyXk+Ph5EFVOX3U2E02 Op9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jMJhjmNJRTxwAAYFcoaiuKWGw7C5rkWRptWqQkRpQEw=; b=J7XqWDbzSCQ1FDVppQ3i/AnqW4y/uR1jsXX9ya19reYjrC5YFAgL07P/pnpSzZGgRW NS1RZARwVYYfBgN4j4BQ/scTFXCRpclWu5kqfqVgc8WYj9lvW9z51exKW+8AnKOqeYfQ ms6p81/1GjAdwwt9zGz08yE0t3+HMUe7KFEfcAB7oQMuYgnkcj6uxUfjeJ3nG2+gXSpP rPkCUyZW0OoMzuKlv40tCojN5MACkTnL2x7C+CzsN+Fh9JJ7Yk+mns0wMNX1weqDyeKi J/9swMiwUpGHPYiqvNn9HAd8aszvUgSxw9nQnO7KHtNqcYCyrGXuJKEX8PKuJMVd/srj lyhg== X-Gm-Message-State: ABUngvcACFk9rJ04XMc72Dh4k10p/dHg3m3KpRPgDrwUZ9oh+sCjU7Xu1KG9NhkgDJ+dvnxL X-Received: by 10.194.94.39 with SMTP id cz7mr11822216wjb.204.1478631462957; Tue, 08 Nov 2016 10:57:42 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id q125sm21117430wmd.2.2016.11.08.10.57.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Nov 2016 10:57:42 -0800 (PST) From: Axel Haslam To: gregkh@linuxfoundation.org, stern@rowland.harvard.edu, nsekhar@ti.com, khilman@kernel.org, david@lechnology.com Subject: [PATCH 3/3] ARM: davinci: remove ohci platform usage Date: Tue, 8 Nov 2016 19:57:38 +0100 Message-Id: <20161108185738.17571-4-ahaslam@baylibre.com> X-Mailer: git-send-email 2.10.1.502.g6598894 In-Reply-To: <20161108185738.17571-1-ahaslam@baylibre.com> References: <20161108185738.17571-1-ahaslam@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161108_105802_739935_CA00C153 X-CRM114-Status: GOOD ( 12.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Axel Haslam , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP As all users of ohci platform data have been converted to use a regulator, we dont need to pass platform data to register the ohci device anymore. Signed-off-by: Axel Haslam --- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- arch/arm/mach-davinci/include/mach/da8xx.h | 2 +- arch/arm/mach-davinci/usb-da8xx.c | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 16a401a..cb67885 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -129,7 +129,7 @@ static __init void da830_evm_usb_init(void) if (ret) pr_warn("fail to add ohci regulator\n"); - ret = da8xx_register_usb11(NULL); + ret = da8xx_register_usb11(); if (ret) pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret); } diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index a252404..cbe7324 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -197,7 +197,7 @@ static __init void omapl138_hawk_usb_init(void) pr_warn("%s: USB PHY registration failed: %d\n", __func__, ret); - ret = da8xx_register_usb11(NULL); + ret = da8xx_register_usb11(); if (ret) pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret); diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index 43322be..6096402 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -91,7 +91,7 @@ int da8xx_register_spi_bus(int instance, unsigned num_chipselect); int da8xx_register_watchdog(void); int da8xx_register_usb_phy(void); int da8xx_register_usb20(unsigned mA, unsigned potpgt); -int da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata); +int da8xx_register_usb11(void); int da8xx_register_usb_refclkin(int rate); int da8xx_register_usb20_phy_clk(bool use_usb_refclkin); int da8xx_register_usb11_phy_clk(bool use_usb_refclkin); diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c index c6feecf..4ea91bb 100644 --- a/arch/arm/mach-davinci/usb-da8xx.c +++ b/arch/arm/mach-davinci/usb-da8xx.c @@ -119,9 +119,8 @@ static struct platform_device da8xx_usb11_device = { .resource = da8xx_usb11_resources, }; -int __init da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata) +int __init da8xx_register_usb11(void) { - da8xx_usb11_device.dev.platform_data = pdata; return platform_device_register(&da8xx_usb11_device); }