From patchwork Mon Oct 14 00:18:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 3034041 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 ACF44BF924 for ; Mon, 14 Oct 2013 00:19:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E6592023F for ; Mon, 14 Oct 2013 00:19:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9BC320237 for ; Mon, 14 Oct 2013 00:19:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755400Ab3JNATA (ORCPT ); Sun, 13 Oct 2013 20:19:00 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:24129 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755331Ab3JNAS7 (ORCPT ); Sun, 13 Oct 2013 20:18:59 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MUM00FJHU7F0J50@mailout3.samsung.com>; Mon, 14 Oct 2013 09:18:55 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 8C.9B.31253.F683B525; Mon, 14 Oct 2013 09:18:55 +0900 (KST) X-AuditID: cbfee690-b7f3b6d000007a15-3c-525b386f578e Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 30.CF.09055.F683B525; Mon, 14 Oct 2013 09:18:55 +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 <0MUM00G5ZU7I7C30@mmp1.samsung.com>; Mon, 14 Oct 2013 09:18:54 +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> <000401cec58c$2dff1c30$89fd5490$%han@samsung.com> <20131011235511.GA2571@kroah.com> In-reply-to: <20131011235511.GA2571@kroah.com> Subject: [PATCH V3] USB: ohci-exynos: Remove non-DT support Date: Mon, 14 Oct 2013 09:18:54 +0900 Message-id: <000701cec872$f7d1c5b0$e7755110$%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: Ac7G3VNsKi3ZHacYQ4604/sDzLBivABlYoAA Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsVy+t8zY918i+gggwlHtS2aF69ns7i88BKr Re+Cq2wWM87vY7JYtKyV2eLwm3ZWi5N/ehktJvy+wGaxfsZrFgdOjzvX9rB57J+7ht1j9t0f jB59W1YxenzeJBfAGsVlk5Kak1mWWqRvl8CVcf/JC8aCZtmKjdc/sTYwLpXoYuTkkBAwkbj1 bz4bhC0mceHeejBbSGAZo8T6JaUwNXcu32LpYuQCii9ilDi46jw7hPOLUeLvwk9MIFVsAmoS X74cZgexRQRMJTa+n8IIUsQssJtJ4tGKu6wQY6cySuz5VgRicwroSZzc3wvWLCxgLdG+bTHY ahYBVYkzM06DxXkFbCUOLbnBBmELSvyYfI8FxGYW0JJYv/M4E4QtL7F5zVvmLkYOoFPVJR79 1YW4wUii7U8bI0SJiMS+F+/A7pEQaOSQ6F3awAqxS0Di2+RDLBC9shKbDjBDfCwpcXDFDZYJ jBKzkGyehWTzLCSbZyFZsYCRZRWjaGpBckFxUnqRiV5xYm5xaV66XnJ+7iZGSExP2MF474D1 IcZkoPUTmaVEk/OBKSGvJN7Q2MzIwtTE1NjI3NKMNGElcV71FutAIYH0xJLU7NTUgtSi+KLS nNTiQ4xMHJxSDYyu2n8dm7nNzqyfoPjVmIch/Jth2XW75ctZIqP6j9tuFHGaXBsmMWt9SPbc cvYIt5wKr8tXvu8T2bTw8FyBO11rp2qycRfH8BRvPPl8clQ+K8fZOZxPV3aJTg7jOuTw9a7l wRO9USJhnN8OJYukvK171azMs93/5EXVd/+MglV/T/y1bZ69sbcSS3FGoqEWc1FxIgDrZdQN /wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFKsWRmVeSWpSXmKPExsVy+t9jAd18i+gggymb1CyaF69ns7i88BKr Re+Cq2wWM87vY7JYtKyV2eLwm3ZWi5N/ehktJvy+wGaxfsZrFgdOjzvX9rB57J+7ht1j9t0f jB59W1YxenzeJBfAGtXAaJORmpiSWqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtq q+TiE6DrlpkDdJGSQlliTilQKCCxuFhJ3w7ThNAQN10LmMYIXd+QILgeIwM0kLCOMeP+kxeM Bc2yFRuvf2JtYFwq0cXIySEhYCJx5/ItFghbTOLCvfVsXYxcHEICixglDq46zw7h/GKU+Lvw ExNIFZuAmsSXL4fZQWwRAVOJje+nMIIUMQvsZpJ4tOIuK0hCSGAqo8Seb0UgNqeAnsTJ/b1g zcIC1hLt2xazgdgsAqoSZ2acBovzCthKHFpygw3CFpT4Mfke2EnMAloS63ceZ4Kw5SU2r3nL 3MXIAXSqusSjv7oQNxhJtP1pY4QoEZHY9+Id4wRGoVlIJs1CMmkWkkmzkLQsYGRZxSiaWpBc UJyUnmuoV5yYW1yal66XnJ+7iRGcMp5J7WBc2WBxiFGAg1GJh1fiUmSQEGtiWXFl7iFGCQ5m JRFeqW9RQUK8KYmVValF+fFFpTmpxYcYk4EencgsJZqcD0xneSXxhsYmZkaWRmYWRibm5qQJ K4nzHmi1DhQSSE8sSc1OTS1ILYLZwsTBKdXAuCvDWWhLdmHSxjNqwtZ1Sfn/O6Zcvf9nje/E zOzfXmaMjD71kiXiGTfy2D8f0JxwL+TVeYbEDVNlpX8aW1jOXGrYdlUtTcjWr6OAYWNX8fLt wd3fNmx6dW/iN+O5Zorvef6vN95l6HI4ofLv//1vfzm56k0J+Gy1cNN8qU/ml3LizG/sfXk4 QYmlOCPRUIu5qDgRAKp1gwNdAwAA 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.4 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 --- - re-based against the latest 'usb-next' branch. drivers/usb/host/ohci-exynos.c | 18 +++--------------- include/linux/platform_data/usb-ohci-exynos.h | 21 --------------------- 2 files changed, 3 insertions(+), 36 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 122e52e..aa50e18 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,14 +91,9 @@ 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) { - usb_put_hcd(hcd); - dev_warn(&pdev->dev, "no platform data or transceiver defined\n"); - return -EPROBE_DEFER; - } else { - exynos_ohci->pdata = pdata; - } + usb_put_hcd(hcd); + 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 */