From patchwork Tue Jun 3 13:31:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 4288841 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2C3579F1D6 for ; Tue, 3 Jun 2014 13:32:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 73487202C8 for ; Tue, 3 Jun 2014 13:32:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1200A201D5 for ; Tue, 3 Jun 2014 13:32:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752824AbaFCNcB (ORCPT ); Tue, 3 Jun 2014 09:32:01 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:21044 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751713AbaFCNcA (ORCPT ); Tue, 3 Jun 2014 09:32:00 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N6L00DYVHLBKZ90@mailout4.samsung.com> for linux-pci@vger.kernel.org; Tue, 03 Jun 2014 22:31:59 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 7F.42.14704.E4ECD835; Tue, 03 Jun 2014 22:31:58 +0900 (KST) X-AuditID: cbfee68f-b7fef6d000003970-b5-538dce4ee014 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 2B.DD.07139.E4ECD835; Tue, 03 Jun 2014 22:31:58 +0900 (KST) Received: from DOJG1HAN03 ([12.36.165.116]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N6L00E7YHLAET10@mmp2.samsung.com>; Tue, 03 Jun 2014 22:31:58 +0900 (KST) From: Jingoo Han To: 'Bjorn Helgaas' Cc: linux-pci@vger.kernel.org, 'Jingoo Han' Subject: [PATCH] PCI: exynos: Add exynos prefix before add_pcie_port/pcie_init Date: Tue, 03 Jun 2014 22:31:58 +0900 Message-id: <000601cf7f30$31b53270$951f9750$%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: Ac9/MDGLCv2a6J5xRaiGgJP10c4LJw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFIsWRmVeSWpSXmKPExsVy+t8zA12/c73BBo+WGlksacqwuLzwEqvF 2XnH2RyYPRZsKvXo27KK0ePzJrkA5igum5TUnMyy1CJ9uwSujKuL1jIX/OWu2HBnEnMD43fO LkZODgkBE4mDB7ayQdhiEhfurQeyuTiEBJYxSkyYOJ8Npujh1b1QiemMEpenPmeFcH4zSmy5 vZYZpIpNQE3iy5fD7CC2iICmxOwVW5hAbGYBR4l1K1+ygtjCAn4SDQ2dYPUsAqoSl3b+B6vh FbCVWLplMTuELSjxY/I9FoheLYn1O49DzZGX2LzmLVAvB9BF6hKP/upCrNKT6H1wmRWiRERi 34t3jCC3SQgsYpe4vuUCO8QuAYlvkw+xQPTKSmw6wAzxmKTEwRU3WCYwis1CsnkWks2zkGye hWTFAkaWVYyiqQXJBcVJ6UXGesWJucWleel6yfm5mxgh8dS/g/HuAetDjMlA6ycyS4km5wPj Ma8k3tDYzMjC1MTU2Mjc0ow0YSVx3vsPk4KEBNITS1KzU1MLUovii0pzUosPMTJxcEo1MG61 kTVp+NS35dbzkFdv8kP1c/Yy8rYWpJuuZ8rba39gftOOhXz3WOR9bnsklt479yRMYpJBoy1P 0GyHyk+rHu/68HkWl4ah6Ip1FTVrNn9zrUsLaTvhmlxz9Wm35NUPpyymLtcwb2lvZ6q8X2r2 ZKnx16YrXsJrfPMeeH18ZPXP+6fBomU2x5RYijMSDbWYi4oTASk/HjC9AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnleLIzCtJLcpLzFFi42I5/e+xoK7fud5gg2Ur9SyWNGVYXF54idXi 7LzjbA7MHgs2lXr0bVnF6PF5k1wAc1QDo01GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6h pYW5kkJeYm6qrZKLT4CuW2YO0B4lhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZo IGEdY8bVRWuZC/5yV2y4M4m5gfE7ZxcjJ4eEgInEw6t72SBsMYkL99YD2VwcQgLTGSUuT33O CuH8ZpTYcnstM0gVm4CaxJcvh9lBbBEBTYnZK7YwgdjMAo4S61a+ZAWxhQX8JBoaOsHqWQRU JS7t/A9WwytgK7F0y2J2CFtQ4sfkeywQvVoS63ceh5ojL7F5zVugXg6gi9QlHv3VhVilJ9H7 4DIrRImIxL4X7xgnMArMQjJpFpJJs5BMmoWkZQEjyypG0dSC5ILipPRcI73ixNzi0rx0veT8 3E2M4Gh9Jr2DcVWDxSFGAQ5GJR7egAM9wUKsiWXFlbmHGCU4mJVEeP+t7w0W4k1JrKxKLcqP LyrNSS0+xJgM9OhEZinR5HxgIskriTc0NjEzsjQyszAyMTcnTVhJnPdgq3WgkEB6Yklqdmpq QWoRzBYmDk6pBsbqVeXrPuxnDF7YdrX2zw4da+lPjvXccn9SD57f9TTP4t5P25wLpx+YJwgE /KrSymutnPHrjObdK3HnD2/uOD9bTD/7z+wamac5ugHvNpZ1N+8+LsB6tkdUye+enIOTt7Wq 2+tE25jrHJ4lTa7nTK0n/WFRcbnXFypz5dLsL31Bu/pvxxq/OKvEUpyRaKjFXFScCABeEM5R GgMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.5 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 add_pcie_port/pcie_init functions are Exynos-specific. Add exynos prefix to avoid collision in global name space. Signed-off-by: Jingoo Han --- drivers/pci/host/pci-exynos.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c index 1632661..2f59851 100644 --- a/drivers/pci/host/pci-exynos.c +++ b/drivers/pci/host/pci-exynos.c @@ -509,8 +509,8 @@ static struct pcie_host_ops exynos_pcie_host_ops = { .host_init = exynos_pcie_host_init, }; -static int __init add_pcie_port(struct pcie_port *pp, - struct platform_device *pdev) +static int __init exynos_add_pcie_port(struct pcie_port *pp, + struct platform_device *pdev) { int ret; @@ -616,7 +616,7 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) goto fail_bus_clk; } - ret = add_pcie_port(pp, pdev); + ret = exynos_add_pcie_port(pp, pdev); if (ret < 0) goto fail_bus_clk; @@ -657,11 +657,11 @@ static struct platform_driver exynos_pcie_driver = { /* Exynos PCIe driver does not allow module unload */ -static int __init pcie_init(void) +static int __init exynos_pcie_init(void) { return platform_driver_probe(&exynos_pcie_driver, exynos_pcie_probe); } -subsys_initcall(pcie_init); +subsys_initcall(exynos_pcie_init); MODULE_AUTHOR("Jingoo Han "); MODULE_DESCRIPTION("Samsung PCIe host controller driver");