From patchwork Thu Nov 6 01:13: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: 5238651 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 9E6EBC11AC for ; Thu, 6 Nov 2014 01:13:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CADCD200E8 for ; Thu, 6 Nov 2014 01:13:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2AF920172 for ; Thu, 6 Nov 2014 01:13:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751195AbaKFBNS (ORCPT ); Wed, 5 Nov 2014 20:13:18 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:19138 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbaKFBNR (ORCPT ); Wed, 5 Nov 2014 20:13:17 -0500 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NEL00KI3FE3UXB0@mailout3.samsung.com> for linux-pci@vger.kernel.org; Thu, 06 Nov 2014 10:13:15 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id BD.CB.11124.B2BCA545; Thu, 06 Nov 2014 10:13:15 +0900 (KST) X-AuditID: cbfee68e-f79b46d000002b74-d7-545acb2b32d8 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 50.F7.20081.B2BCA545; Thu, 06 Nov 2014 10:13:15 +0900 (KST) Received: from DOJG1HAN03 ([10.89.38.123]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NEL003QXFE3M310@mmp2.samsung.com>; Thu, 06 Nov 2014 10:13:15 +0900 (KST) From: Jingoo Han To: 'Bjorn Helgaas' Cc: linux-pci@vger.kernel.org, 'Mohit Kumar' , 'Viresh Kumar' , 'Pratyush Anand' , 'Jingoo Han' Subject: [PATCH] PCI: spear: Add exynos spear13xx before add_pcie_port/pcie_init Date: Thu, 06 Nov 2014 10:13:49 +0900 Message-id: <001401cff95e$ec061f60$c4125e20$%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/5Xuvt9AL5GIwKREOC1mwEJ7XJlA== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRmVeSWpSXmKPExsVy+t8zY13t01EhBocvKlosacqweHlI0+Ly wkusFmfnHWez2Dj1F6NF+yVli41fPRzYPRZsKvW4c20Pm0ffllWMHk9/7GX2+LxJLoA1issm JTUnsyy1SN8ugSvj7uv/TAWNvBUbN1xlamD8zdXFyMkhIWAicbZhIjuELSZx4d56ti5GLg4h gWWMEu9bzzPBFP37cAAqMZ1RYuPOTywQzi9GiWVrzzGDVLEJqEl8+XIYbJSIgKbE7BVbmECK mAX2Mkr8utDACpIQFgiQ2Pf3E1gRi4CqxJt/98BW8ArYSqz4uJYdwhaU+DH5HguIzSygJbF+ 53EmCFteYvOat0DLOIBOUpd49FcXYpeexIn2W2wQJSIS+168YwTZKyFwil1ixoNfLBC7BCS+ TT7EAtErK7HpADPEZ5ISB1fcYJnAKDYLyeZZSDbPQrJ5FpIVCxhZVjGKphYkFxQnpRcZ6RUn 5haX5qXrJefnbmKExGHfDsabB6wPMQpwMCrx8O44GhUixJpYVlyZe4jRFOiiicxSosn5wGjP K4k3NDYzsjA1MTU2Mrc0UxLnTZD6GSwkkJ5YkpqdmlqQWhRfVJqTWnyIkYmDU6qBUaeyOfN2 ufuup3xve5zd68yV/gZ1FTcoSPder1zll6K1VT7sVOiy9OpG1oM7wsRTCo1FPHWOVtVKzVWK 4WkRvVV9lP9Iv93RA/w/rih2eJxrljYqUNffJF2pXSl3qLbo5GvF2Kg79zfcinpk15SRfbtm 24V/AmZp4qz7O9j3LfjzxtJTNVqJpTgj0VCLuag4EQAD8pjQvgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKIsWRmVeSWpSXmKPExsVy+t9jQV3t01EhBo/nyFosacqweHlI0+Ly wkusFmfnHWez2Dj1F6NF+yVli41fPRzYPRZsKvW4c20Pm0ffllWMHk9/7GX2+LxJLoA1qoHR JiM1MSW1SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwfoBCWFssSc UqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYR1jxt3X/5kKGnkrNm64ytTA+Juri5GT Q0LAROLfhwNsELaYxIV764FsLg4hgemMEht3fmKBcH4xSixbe44ZpIpNQE3iy5fD7CC2iICm xOwVW5hAipgF9jJK/LrQwAqSEBYIkNj39xNYEYuAqsSbf/eYQGxeAVuJFR/XskPYghI/Jt9j AbGZBbQk1u88zgRhy0tsXvMWaBkH0EnqEo/+6kLs0pM40X6LDaJERGLfi3eMExgFZiGZNAvJ pFlIJs1C0rKAkWUVo2hqQXJBcVJ6rqFecWJucWleul5yfu4mRnCUP5PawbiyweIQowAHoxIP 746jUSFCrIllxZW5hxglOJiVRHjfHAcK8aYkVlalFuXHF5XmpBYfYjQFenQis5Rocj4wAeWV xBsam5gZWRqZWRiZmJsrifMeaLUOFBJITyxJzU5NLUgtgulj4uCUamCMv/di3dG10mVrHrHn Z/ur69oyOkes4AyInMJt6J1xvvvBzpkbDBS8DNr212naiis4dZ5tPmqteEJL7kT+C+c3zbWX jz78H7ImZf3NmZqaE0/efPU2KCYjuaZm5ev0U83HmZiu58ZWru1ltL7dcO8+W+xZL8HaNiXh Em6tB4yZO1+qHeJos1RiKc5INNRiLipOBADcePiYCAMAAA== 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 SPEAr13xx-specific. Add exynos prefix to avoid collision in global name space. Signed-off-by: Jingoo Han --- drivers/pci/host/pcie-spear13xx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/pci/host/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c index 85f594e..63f869f 100644 --- a/drivers/pci/host/pcie-spear13xx.c +++ b/drivers/pci/host/pcie-spear13xx.c @@ -269,7 +269,8 @@ static struct pcie_host_ops spear13xx_pcie_host_ops = { .host_init = spear13xx_pcie_host_init, }; -static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) +static int spear13xx_add_pcie_port(struct pcie_port *pp, + struct platform_device *pdev) { struct device *dev = &pdev->dev; int ret; @@ -352,7 +353,7 @@ static int __init spear13xx_pcie_probe(struct platform_device *pdev) if (of_property_read_bool(np, "st,pcie-is-gen1")) spear13xx_pcie->is_gen1 = true; - ret = add_pcie_port(pp, pdev); + ret = spear13xx_add_pcie_port(pp, pdev); if (ret < 0) goto fail_clk; @@ -382,11 +383,11 @@ static struct platform_driver spear13xx_pcie_driver __initdata = { /* SPEAr13xx PCIe driver does not allow module unload */ -static int __init pcie_init(void) +static int __init spear13xx_pcie_init(void) { return platform_driver_register(&spear13xx_pcie_driver); } -module_init(pcie_init); +module_init(spear13xx_pcie_init); MODULE_DESCRIPTION("ST Microelectronics SPEAr13xx PCIe host controller driver"); MODULE_AUTHOR("Pratyush Anand ");