From patchwork Wed Oct 22 04:58:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 5129591 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 688F7C11AC for ; Wed, 22 Oct 2014 04:58:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A6606201ED for ; Wed, 22 Oct 2014 04:58:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B28322015A for ; Wed, 22 Oct 2014 04:58:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750814AbaJVE6m (ORCPT ); Wed, 22 Oct 2014 00:58:42 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:50084 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750769AbaJVE6l (ORCPT ); Wed, 22 Oct 2014 00:58:41 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NDT00EA2XTRCP60@mailout1.samsung.com> for linux-pci@vger.kernel.org; Wed, 22 Oct 2014 13:58:39 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id B3.A6.17016.F7937445; Wed, 22 Oct 2014 13:58:39 +0900 (KST) X-AuditID: cbfee68d-f79296d000004278-22-5447397faa9f Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A6.A4.20081.F7937445; Wed, 22 Oct 2014 13:58:39 +0900 (KST) Received: from DOJG1HAN03 ([10.89.38.123]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NDT00115XTREOI0@mmp1.samsung.com>; Wed, 22 Oct 2014 13:58:39 +0900 (KST) From: Jingoo Han To: 'Bjorn Helgaas' Cc: linux-pci@vger.kernel.org, 'Jingoo Han' Subject: [PATCH RESEND ] PCI: exynos: Add exynos prefix before add_pcie_port/pcie_init Date: Wed, 22 Oct 2014 13:58:49 +0900 Message-id: <000001cfedb4$de2ab230$9a801690$%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: Ac/ttN4EOeYfRXSZRKO91vSS/w5/ww== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeLIzCtJLcpLzFFi42I5/e+ZsW69pXuIwfl74hZLmjIsLi+8xGpx dt5xNgdmjwWbSj36tqxi9Pi8SS6AOYrLJiU1J7MstUjfLoErY+qtXewFf7grmps/szYwfuPs YuTkkBAwkVj9ezkzhC0mceHeerYuRi4OIYFljBJT+pazdjFygBWdb9aEiC9ilNj74yQrhPOL UeL6g1WsIN1sAmoSX74cZgexRQQ0JWav2MIEYjMLOEqsW/kSrEZYIEKicdZ6sG0sAqoSjf/W MoLYvAK2Eg92tDJB2IISPybfY4Ho1ZJYv/M41Bx5ic1r3jJDHKQu8eivLsQqPYlVqxYzQ5SI SOx78Y4R5DYJgXnsEtP3fIPaJSDxbfIhFoheWYlNB6AelpQ4uOIGywRGsVlINs9CsnkWks2z kKxYwMiyilE0tSC5oDgpvchQrzgxt7g0L10vOT93EyMkmnp3MN4+YH2IUYCDUYmH14HNPUSI NbGsuDL3EKMp0EUTmaVEk/OBMZtXEm9obGZkYWpiamxkbmmmJM6rKPUzWEggPbEkNTs1tSC1 KL6oNCe1+BAjEwenVAMj0z93084tzyaFrHKYYjrj1qcDZkn8PxZnvHz3TEHj7Fk/0RObsr/q PXoq8qzW44Ma2482h9utdxcc+3D7O/N7hq83fn3yTqx7ryPyt9ROmk9z08EguXzu/J863zaH XXut9W9T873pfeami9W+WD67vXarwfkXaSYB5t++nCuecJXjXefZ/Pm64UosxRmJhlrMRcWJ AHy3LFehAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsVy+t9jAd16S/cQg8Y2EYslTRkWlxdeYrU4 O+84mwOzx4JNpR59W1YxenzeJBfAHNXAaJORmpiSWqSQmpecn5KZl26r5B0c7xxvamZgqGto aWGupJCXmJtqq+TiE6DrlpkDtEdJoSwxpxQoFJBYXKykb4dpQmiIm64FTGOErm9IEFyPkQEa SFjHmDH11i72gj/cFc3Nn1kbGL9xdjFycEgImEicb9bsYuQEMsUkLtxbz9bFyMUhJLCIUWLv j5OsEM4vRonrD1axglSxCahJfPlymB3EFhHQlJi9YgsTiM0s4CixbuVLsBphgQiJxlnrmUFs FgFVicZ/axlBbF4BW4kHO1qZIGxBiR+T77FA9GpJrN95HGqOvMTmNW+ZIY5Tl3j0VxdilZ7E qlWLmSFKRCT2vXjHOIFRYBaSSbOQTJqFZNIsJC0LGFlWMYqmFiQXFCel5xrqFSfmFpfmpesl 5+duYgTH6jOpHYwrGywOMQpwMCrx8DqwuYcIsSaWFVfmHmKU4GBWEuHdpwoU4k1JrKxKLcqP LyrNSS0+xGgK9OhEZinR5HxgGskriTc0NjEzsjQyszAyMTdXEuc90GodKCSQnliSmp2aWpBa BNPHxMEp1cBocPXfe84Lectu+/atMyy4p/9udV7FTemepjrBM/v6PRuPXQ1f+iFq0cWVIqki B6t9bLjnra5a+sjw/X7VKuZkz4p9ugsVF+iXMt17vXSuQOyeKSY5ClvnaRZb/3gqwHTznIUC 14tshuuT53C8105y+d3zas3Unh0Wczhz/eZeei2pdMXrDU+OEktxRqKhFnNRcSIAcwEtXesC AAA= 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=-8.3 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 c5d0ca3..902d7cd 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; @@ -615,7 +615,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; @@ -656,11 +656,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");