From patchwork Thu Oct 10 06:32:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 3014271 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A267CBF924 for ; Thu, 10 Oct 2013 06:32:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34245203A3 for ; Thu, 10 Oct 2013 06:32:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B101E202C3 for ; Thu, 10 Oct 2013 06:32:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751996Ab3JJGcW (ORCPT ); Thu, 10 Oct 2013 02:32:22 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:9390 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751772Ab3JJGcV (ORCPT ); Thu, 10 Oct 2013 02:32:21 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MUF00LS0WTVXL70@mailout4.samsung.com>; Thu, 10 Oct 2013 15:32:19 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.49]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id EE.6D.31253.3F946525; Thu, 10 Oct 2013 15:32:19 +0900 (KST) X-AuditID: cbfee690-b7f3b6d000007a15-4c-525649f31787 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 2E.3E.09055.3F946525; Thu, 10 Oct 2013 15:32:19 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MUF00BAAWTVAK00@mmp1.samsung.com>; Thu, 10 Oct 2013 15:32:19 +0900 (KST) From: Jingoo Han To: 'Greg Kroah-Hartman' Cc: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org, 'Kukjin Kim' , 'Alan Stern' , 'Sylwester Nawrocki' , 'Tomasz Figa' , 'Jingoo Han' References: <000001cec582$02a6cfb0$07f46f10$%han@samsung.com> In-reply-to: <000001cec582$02a6cfb0$07f46f10$%han@samsung.com> Subject: [PATCH 4/5] USB: ohci-exynos: Remove non-DT support Date: Thu, 10 Oct 2013 15:32:19 +0900 Message-id: <000a01cec582$7835dfa0$68a19ee0$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac7FggI+9Gc/UHTXR/6J62TM6wkGowAAGo/g Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrEIsWRmVeSWpSXmKPExsVy+t8zQ93PnmFBBg2z1C2aF69ns7i88BKr Re+Cq2wWM87vY7JYtKyV2eLwm3ZWiwm/L7BZrJ/xmsWBw2P/3DXsHrPv/mD06NuyitHj8ya5 AJYoLpuU1JzMstQifbsErozPbRvZCxbIVHw5d5OtgfGqeBcjJ4eEgInE1m3f2CBsMYkL99YD 2VwcQgLLGCXOPt3BBlO0Z88DdojEIkaJk43Toap+MUocebAarIpNQE3iy5fD7CC2iICpxMb3 UxhBbGaBfiaJq0fSQGwhAVuJr/9Xs4DYnAJ2EtO7N4HVCwvYSDyc/wzMZhFQlTj0YhsTiM0L VN/Z8YYVwhaU+DH5HgvETC2J9TuPM0HY8hKb17xl7mLkALpUXeLRX12IE4wk5s+7zQZRIiKx 78U7RpCbJQTeskt8PD+BBWKXgMS3yYdYIHplJTYdYIZ4WFLi4IobLBMYJWYh2TwLyeZZSDbP QrJiASPLKkbR1ILkguKk9CITveLE3OLSvHS95PzcTYyQ+J2wg/HeAetDjMlA6ycyS4km5wPj P68k3tDYzMjC1MTU2Mjc0ow0YSVxXvUW60AhgfTEktTs1NSC1KL4otKc1OJDjEwcnFINjG4d 5usNzLw3bmVzWzWbYZuW+jWzuH8RW9uT9JyaZ0oejei4/FD8+C8Omc2zrlbV+17lzHdUe9j7 KG/mR9MryY9kJqzVM4wtj3/6dV34DeX9kzauT9P0WLrtwK9T3nEip0/zrJkn2qgW+/PBy5uJ zlIdvjeP/KjLnF7kVRJ8Pycu08n6FVd5mxJLcUaioRZzUXEiAJ7yUmv1AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPKsWRmVeSWpSXmKPExsVy+t9jAd3PnmFBBtvnK1k0L17PZnF54SVW i94FV9ksZpzfx2SxaFkrs8XhN+2sFhN+X2CzWD/jNYsDh8f+uWvYPWbf/cHo0bdlFaPH501y ASxRDYw2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6hpYW5koKeYm5qbZKLj4Bum6ZOUB3 KCmUJeaUAoUCEouLlfTtME0IDXHTtYBpjND1DQmC6zEyQAMJ6xgzPrdtZC9YIFPx5dxNtgbG q+JdjJwcEgImEnv2PGCHsMUkLtxbz9bFyMUhJLCIUeJk43Qo5xejxJEHq9lAqtgE1CS+fDkM 1iEiYCqx8f0URhCbWaCfSeLqkTQQW0jAVuLr/9UsIDangJ3E9O5NYPXCAjYSD+c/A7NZBFQl Dr3YxgRi8wLVd3a8YYWwBSV+TL7HAjFTS2L9zuNMELa8xOY1b5m7GDmALlWXePRXF+IEI4n5 826zQZSISOx78Y5xAqPQLCSTZiGZNAvJpFlIWhYwsqxiFE0tSC4oTkrPNdQrTswtLs1L10vO z93ECE4Oz6R2MK5ssDjEKMDBqMTDW1EWGiTEmlhWXJl7iFGCg1lJhHf6SaAQb0piZVVqUX58 UWlOavEhxmSgRycyS4km5wMTV15JvKGxiZmRpZGZhZGJuTlpwkrivAdarQOFBNITS1KzU1ML UotgtjBxcEo1MB5IeHcgQfVM7eU3oUqLOVPWxmxt4OOt8dI6Ervk8p1vkjZvs94p+hWyya1m 3+pr0jF7T3zGcoPedRdvcFdeZ+qsXnZTUP6r3LFdjxWPGO7KOl/zN0fpu57XMTYhw2W7jqjs ktioZXt1Uc28p67nL3FGMt8Lbo/aW7pw0vo/0nZJUyoFlCafqlViKc5INNRiLipOBABrtmdP UgMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The non-DT for EXYNOS SoCs is not supported from v3.11. Thus, there is no need to support non-DT for Exynos OHCI driver. The 'include/linux/platform_data/usb-ohci-exynos.h' file has been used for non-DT support. Thus, the 'usb-ohci-exynos.h' file can be removed. Signed-off-by: Jingoo Han --- drivers/usb/host/ohci-exynos.c | 16 ++-------------- include/linux/platform_data/usb-ohci-exynos.h | 21 --------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 include/linux/platform_data/usb-ohci-exynos.h diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c index f5f372e..5c877bf 100644 --- a/drivers/usb/host/ohci-exynos.c +++ b/drivers/usb/host/ohci-exynos.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -38,7 +37,6 @@ struct exynos_ohci_hcd { struct clk *clk; struct usb_phy *phy; struct usb_otg *otg; - struct exynos4_ohci_platdata *pdata; }; static void exynos_ohci_phy_enable(struct platform_device *pdev) @@ -48,8 +46,6 @@ static void exynos_ohci_phy_enable(struct platform_device *pdev) if (exynos_ohci->phy) usb_phy_init(exynos_ohci->phy); - else if (exynos_ohci->pdata && exynos_ohci->pdata->phy_init) - exynos_ohci->pdata->phy_init(pdev, USB_PHY_TYPE_HOST); } static void exynos_ohci_phy_disable(struct platform_device *pdev) @@ -59,13 +55,10 @@ static void exynos_ohci_phy_disable(struct platform_device *pdev) if (exynos_ohci->phy) usb_phy_shutdown(exynos_ohci->phy); - else if (exynos_ohci->pdata && exynos_ohci->pdata->phy_exit) - exynos_ohci->pdata->phy_exit(pdev, USB_PHY_TYPE_HOST); } static int exynos_ohci_probe(struct platform_device *pdev) { - struct exynos4_ohci_platdata *pdata = dev_get_platdata(&pdev->dev); struct exynos_ohci_hcd *exynos_ohci; struct usb_hcd *hcd; struct resource *res; @@ -98,13 +91,8 @@ static int exynos_ohci_probe(struct platform_device *pdev) phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); if (IS_ERR(phy)) { - /* Fallback to pdata */ - if (!pdata) { - dev_warn(&pdev->dev, "no platform data or transceiver defined\n"); - return -EPROBE_DEFER; - } else { - exynos_ohci->pdata = pdata; - } + dev_warn(&pdev->dev, "no platform data or transceiver defined\n"); + return -EPROBE_DEFER; } else { exynos_ohci->phy = phy; exynos_ohci->otg = phy->otg; diff --git a/include/linux/platform_data/usb-ohci-exynos.h b/include/linux/platform_data/usb-ohci-exynos.h deleted file mode 100644 index c256c59..0000000 --- a/include/linux/platform_data/usb-ohci-exynos.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2011 Samsung Electronics Co.Ltd - * http://www.samsung.com/ - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -#ifndef __MACH_EXYNOS_OHCI_H -#define __MACH_EXYNOS_OHCI_H - -struct exynos4_ohci_platdata { - int (*phy_init)(struct platform_device *pdev, int type); - int (*phy_exit)(struct platform_device *pdev, int type); -}; - -extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd); - -#endif /* __MACH_EXYNOS_OHCI_H */