From patchwork Thu Nov 24 15:28:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 9445807 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 EBC5260235 for ; Thu, 24 Nov 2016 15:31:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D62A227F88 for ; Thu, 24 Nov 2016 15:31:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6F2627FA8; Thu, 24 Nov 2016 15:31:25 +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 3041727F88 for ; Thu, 24 Nov 2016 15:31:24 +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 1c9vyI-0003o1-Jc; Thu, 24 Nov 2016 15:29:58 +0000 Received: from mail-wj0-x236.google.com ([2a00:1450:400c:c01::236]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9vxM-0003Qf-LA for linux-arm-kernel@lists.infradead.org; Thu, 24 Nov 2016 15:29:03 +0000 Received: by mail-wj0-x236.google.com with SMTP id v7so36064946wjy.2 for ; Thu, 24 Nov 2016 07:28:39 -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=ntGRRmMEDZKHq6hIJG8u6tH2hWTp8C100VKvLwSHiXY=; b=TLahQkXbv1R8wX5sIfVzmvvHGZssas03kJaz9t0YFbRF0Zx1qe/cggLkCuCmLOee0g QKWTltMnXIrnSY4Ikhgzn7QxHFp8lTv9kTes1+gCVec38fuVnFrAClml0W6vTYhS/YTR dykNDyxAJU4+XuV/7nqySVxURBXZ6PRI/C0hJFgzvG1T2nqHVDRN8Pi6jtwZP9nHmq6R G+x3bYst+hMqYu++lfcZDHXoslu/9tCeF5ZqhBqaLl4a1derbhEEfdSJPv9uwfKC+FwH SXcMcbw1aeHoxyPIlwdZcRTmz3aq//g0J+n1+6E7xvQVQsZy03JO+utHwdo262xr3J+t wPcw== 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=ntGRRmMEDZKHq6hIJG8u6tH2hWTp8C100VKvLwSHiXY=; b=XG7HUy1XN44r6LKPGGh9BqYy7jOrzr8ytQa0jgNI0GfxLeZ4McN97SpTofko8X0wA2 OYnHslxVi1X9Xh2nglnJIhV4+fvKdwh7Tdt6DKPFBiOtYtvz0o0zQKmpS+MPE7Ra2jOL QpiS4iZkFSVvzSSRTW4Z5TBoP2rCcg+A6RKSr5aU47mtzmF6OFzY9wofe4xTEeSEaw/p gDdz6XmGJX7SBWMXfCy+SxUjUMs5byzJvV2WnZ1Y2HOWrZc8uHI6WkwkvHKk28fkBjQ1 hyE5cqfeuPKTo5XqFNpXQ6dDeJCM9lbwgrt0f7SYOgSQYBN1R3enTMRYr+qC6d0yNBKJ xefQ== X-Gm-Message-State: AKaTC009+CtLuJOBiPTSVwTFIhNbq34lvZiDehK1s4vo1B5y4KQn9ZH3FxIRd1cbU4VRS0ds X-Received: by 10.194.22.41 with SMTP id a9mr3245659wjf.30.1480001318540; Thu, 24 Nov 2016 07:28:38 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id cl6sm35067025wjc.10.2016.11.24.07.28.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Nov 2016 07:28:38 -0800 (PST) From: Axel Haslam To: nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com Subject: [PATCH v2 3/3] ARM: davinci: remove ohci platform usage Date: Thu, 24 Nov 2016 16:28:31 +0100 Message-Id: <20161124152831.26678-4-ahaslam@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161124152831.26678-1-ahaslam@baylibre.com> References: <20161124152831.26678-1-ahaslam@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161124_072901_002815_696F52FE X-CRM114-Status: GOOD ( 12.56 ) 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-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 253d9af..223de79 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -130,7 +130,7 @@ static __init void da830_evm_usb_init(void) pr_warn("%s: USB 1.1 regulator register 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/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 85ff218..b21ef07 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 b010e5f..a438e2b 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); }