From patchwork Thu Oct 10 07:41:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 3014641 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 7A823BF924 for ; Thu, 10 Oct 2013 07:41:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 259A42016C for ; Thu, 10 Oct 2013 07:41:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C30AA20163 for ; Thu, 10 Oct 2013 07:41:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751737Ab3JJHlw (ORCPT ); Thu, 10 Oct 2013 03:41:52 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:29174 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754152Ab3JJHlv (ORCPT ); Thu, 10 Oct 2013 03:41:51 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MUG0048Q000IWJ0@mailout2.samsung.com>; Thu, 10 Oct 2013 16:41:50 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id C2.35.30629.E3A56525; Thu, 10 Oct 2013 16:41:50 +0900 (KST) X-AuditID: cbfee68d-b7fe86d0000077a5-0d-52565a3e826e Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id CE.D1.09055.D3A56525; Thu, 10 Oct 2013 16:41:49 +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 <0MUG00BG101PYIG0@mmp1.samsung.com>; Thu, 10 Oct 2013 16:41:49 +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' , 'Sachin Kamat' , 'Jingoo Han' References: <000101cec58b$ee8bd2f0$cba378d0$%han@samsung.com> In-reply-to: <000101cec58b$ee8bd2f0$cba378d0$%han@samsung.com> Subject: [PATCH V2 3/5] USB: ohci-exynos: Remove non-DT support Date: Thu, 10 Oct 2013 16:41:49 +0900 Message-id: <000401cec58c$2dff1c30$89fd5490$%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: Ac7Fi+5bS2rX9cS6SFqxMcDwCOMqpwAAC5Ww Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsVy+t8zY127qLAgg2eTmS2aF69ns7i88BKr Re+Cq2wWM87vY7JYtKyV2eLwm3ZWi5N/ehktJvy+wGaxfsZrFgdOjzvX9rB57J+7ht1j9t0f jB59W1YxenzeJBfAGsVlk5Kak1mWWqRvl8CV8bltI3vBApmKL+dusjUwXhXvYuTkkBAwkTjV sYYZwhaTuHBvPRuILSSwjFFi3jR9mJrHm1axdDFyAcUXMUq0XbsB5fxilHhzYQNYB5uAmsSX L4fZQWwRAVOJje+nMIIUMQvsZpJ4tOIuK8RYW4lTN2+AFXEK2ElsnjOLBcQWFrCXuNv5EugM Dg4WAVWJHdcEQMK8QOWfvs1hhrAFJX5MvgdWziygJbF+53EmCFteYvOat2CtEgLqEo/+6oKY IgJGEp33mCEqRCT2vXgHdo2EwF92icYr7WBjWAQEJL5NPsQC0SorsekANBwkJQ6uuMEygVFi FpLFs5AsnoVk8SwkKxYwsqxiFE0tSC4oTkovMtQrTswtLs1L10vOz93ECInn3h2Mtw9YH2JM Blo/kVlKNDkfmA7ySuINjc2MLExNTI2NzC3NSBNWEudVa7EOFBJITyxJzU5NLUgtii8qzUkt PsTIxMEp1cB4bu9qGQ3H4+3JLd+26sVcWGkanBBt08YlsEiHfb4T304vyRi5JQnW/+dzJ/y2 WJPjbNMR267CtSBle/bnEC7ljUXvJ0kn1thvW/Btgljag0NTVHtaHCsnS/LVHz0k6dqylDug +9Wu47bHfIMFw26t5NGUSvwyW/9yYYXIybvssTm2TXvyNyuxFGckGmoxFxUnAgDW/ebX/QIA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBKsWRmVeSWpSXmKPExsVy+t9jAV3bqLAgg889NhbNi9ezWVxeeInV onfBVTaLGef3MVksWtbKbHH4TTurxck/vYwWE35fYLNYP+M1iwOnx51re9g89s9dw+4x++4P Ro++LasYPT5vkgtgjWpgtMlITUxJLVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21 VXLxCdB1y8wBukhJoSwxpxQoFJBYXKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjHmPG5bSN7 wQKZii/nbrI1MF4V72Lk5JAQMJF4vGkVC4QtJnHh3nq2LkYuDiGBRYwSbddusEA4vxgl3lzY wAZSxSagJvHly2F2EFtEwFRi4/spjCBFzAK7mSQerbjLCpIQErCVOHXzBlgRp4CdxOY5s8BW CAvYS9ztfMncxcjBwSKgKrHjmgBImBeo/NO3OcwQtqDEj8n3wMqZBbQk1u88zgRhy0tsXvMW rFVCQF3i0V9dEFNEwEii8x4zRIWIxL4X7xgnMArNQjJoFpJBs5AMmoWkZQEjyypG0dSC5ILi pPRcQ73ixNzi0rx0veT83E2M4HTxTGoH48oGi0OMAhyMSjy8FWWhQUKsiWXFlbmHGCU4mJVE eKefBArxpiRWVqUW5ccXleakFh9iTAZ6cyKzlGhyPjCV5ZXEGxqbmBlZGplZGJmYm5MmrCTO e6DVOlBIID2xJDU7NbUgtQhmCxMHp1QDI2fx01Kf1Qe9D/n4L9A7/OhWUHSCq73gnQer/B5M 411d9aLs4NN/gv5dJduLJl/8cuxfeMcrP6N028+iSkX2RituShRM+Xf2X3R9/6e7z7ZvtLLL ZTWdml9Yp2neOV+ijMXZXvjByY2VjiKFUUqaG1sPX973evplA4M1akLVwRs/c2T8nHAzRoml OCPRUIu5qDgRAAcfyuFbAwAA 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 */