From patchwork Thu Nov 6 01:29:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 5238661 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 EA37F9F295 for ; Thu, 6 Nov 2014 01:29:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D045E201E4 for ; Thu, 6 Nov 2014 01:29:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE51520173 for ; Thu, 6 Nov 2014 01:29:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751052AbaKFB3J (ORCPT ); Wed, 5 Nov 2014 20:29:09 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:21230 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002AbaKFB3I (ORCPT ); Wed, 5 Nov 2014 20:29:08 -0500 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NEL00A3WG4JEF50@mailout4.samsung.com> for linux-pci@vger.kernel.org; Thu, 06 Nov 2014 10:29:07 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id B1.C5.11124.3EECA545; Thu, 06 Nov 2014 10:29:07 +0900 (KST) X-AuditID: cbfee68e-f79b46d000002b74-22-545acee36be0 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 5C.8B.20081.2EECA545; Thu, 06 Nov 2014 10:29:06 +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 <0NEL008U5G4IZD30@mmp1.samsung.com>; Thu, 06 Nov 2014 10:29:06 +0900 (KST) From: Jingoo Han To: 'Bjorn Helgaas' Cc: linux-pci@vger.kernel.org, 'Mohit Kumar' , 'Viresh Kumar' , 'Pratyush Anand' , 'Jingoo Han' References: <001401cff95e$ec061f60$c4125e20$%han@samsung.com> In-reply-to: <001401cff95e$ec061f60$c4125e20$%han@samsung.com> Subject: [PATCH V2] PCI: spear: Add spear13xx before add_pcie_port/pcie_init Date: Thu, 06 Nov 2014 10:29:41 +0900 Message-id: <001601cff961$232f2570$698d7050$%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/5Xuvt9AL5GIwKREOC1mwEJ7XJlAAAhpJA Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsVy+t8zY93H56JCDJpXMFssacqweHlI0+Ly wkusFmfnHWez2Dj1F6NF+yVli41fPRzYPRZsKvW4c20Pm0ffllWMHk9/7GX2+LxJLoA1issm JTUnsyy1SN8ugSvj6Z3dbAUneSs2H7nL1sC4hbuLkYNDQsBE4vgm/i5GTiBTTOLCvfVsXYxc HEICyxglDl68xQ6RMJHoWX6OHSKxiFHidu9DZgjnF6PEhJ+rwarYBNQkvnw5DGaLCGhKzF6x hQmkiFlgL6PErwsNrCAJIQFbiTXH+phAbE4BO4nlS68xgtjCAj4S629uBKthEVCV2PnuEAuI zQtUv/PrLmYIW1Dix+R7YHFmAS2J9TuPM0HY8hKb17xlhnhHXeLRX12IG4wkzvxZxg5RIiKx 78U7RpB7JAQesUu83jOVBWKXgMS3ySC7QHplJTYdYIb4WFLi4IobLBMYJWYh2TwLyeZZSDbP QrJiASPLKkbR1ILkguKk9CIjveLE3OLSvHS95PzcTYyQqO3bwXjzgPUhRgEORiUe3oNnokKE WBPLiitzDzGaAl00kVlKNDkfmBrySuINjc2MLExNTI2NzC3NlMR5E6R+BgsJpCeWpGanphak FsUXleakFh9iZOLglGpg1D22sGBt94qCIJaOZ19fiFQ4H7yRN6HghdJTiZjbuwKKy2YKaJ0M clp1tPcst2iqkEYla+qRsv9bax/s3rMs1kHoyPsH3yc+vSlYJikuemRj76oJlZ92b6wPYl3G 8GfVv0rpvIcfPI0z/JvunD6n8sG8cPX+vK8TTzy4kdXy58qMrAWyumz98UosxRmJhlrMRcWJ AM/WwiTVAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplleLIzCtJLcpLzFFi42I5/e+xgO6jc1EhBkc/W1ssacqweHlI0+Ly wkusFmfnHWez2Dj1F6NF+yVli41fPRzYPRZsKvW4c20Pm0ffllWMHk9/7GX2+LxJLoA1qoHR JiM1MSW1SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwfoBCWFssSc UqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYR1jxtM7u9kKTvJWbD5yl62BcQt3FyMn h4SAiUTP8nPsELaYxIV769m6GLk4hAQWMUrc7n3IDOH8YpSY8HM1WBWbgJrEly+HwWwRAU2J 2Su2MIEUMQvsZZT4daGBFSQhJGArseZYHxOIzSlgJ7F86TVGEFtYwEdi/c2NYDUsAqoSO98d YgGxeYHqd37dxQxhC0r8mHwPLM4soCWxfudxJghbXmLzmrdANRxAp6pLPPqrC3GDkcSZP8vY IUpEJPa9eMc4gVFoFpJJs5BMmoVk0iwkLQsYWVYxiqYWJBcUJ6XnGuoVJ+YWl+al6yXn525i BCeFZ1I7GFc2WBxiFOBgVOLh3XE0KkSINbGsuDL3EKMEB7OSCG/RaaAQb0piZVVqUX58UWlO avEhRlOgRycyS4km5wMTVl5JvKGxiZmRpZGZhZGJubmSOO+BVutAIYH0xJLU7NTUgtQimD4m Dk6pBsZzzzerm7zcxirZ9pB12ty8WRLLdP5tb9SMCHi4V6SBs/CoqH3Oqoyo/TZbapll20Sf Kdx6fnYSB+cu+wdCszsnZ8g4eZzi//7ovpz8U+Fj/zJMT/kmJG2s9M9dInTmjXZK5laZ98qv NRdWdCR0XupdffVLyBI+423TV7V9WS+72iaJw9+IxUqJpTgj0VCLuag4EQBYiJWPIAMAAA== 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 spear13xx prefix to avoid collision in global name space. Signed-off-by: Jingoo Han Acked-by: Viresh Kumar --- Change since v1: - Remove 'exynos' typo from the commit message. 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 ");