From patchwork Mon Feb 9 20:12:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 5803301 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 896D79F336 for ; Mon, 9 Feb 2015 20:12:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF5042011B for ; Mon, 9 Feb 2015 20:12:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D88782011D for ; Mon, 9 Feb 2015 20:12:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759473AbbBIUMg (ORCPT ); Mon, 9 Feb 2015 15:12:36 -0500 Received: from mail-qa0-f41.google.com ([209.85.216.41]:60391 "EHLO mail-qa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759368AbbBIUMg (ORCPT ); Mon, 9 Feb 2015 15:12:36 -0500 Received: by mail-qa0-f41.google.com with SMTP id x12so5821158qac.0 for ; Mon, 09 Feb 2015 12:12:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=IrtgDktsBHAd7ixsiDItgYMEdxqxfE75v2wef+PXjBg=; b=ALgJWf99CSE9dCW+0ZUavm/55vBkSsy43W+yjkM0voqYm1V126tZ1y2dzwVgZ6sWsg ccSHxZ24gvz0DNLiSofqs7Gdf3DWcAI50NK0j3rQm+6DbQ4Oq9Ij+gJFknoFiPx3YP0K 2vW6ZZDjZmvwm7NBxQzIp2oFOC5YNkMrqaqf7HvdygxnMKomg97f9UJTiHkaEk16Ivmc Agc1hz7FOcXr9z3jRNgbR/0BDr33L21XOI00slma8hCNjWRAZK7Koc/6lbkwT+zr1/OB fq9pQrtyAaPKqdoT7RxCuHbWzWDASZkBtzvzei7nA49JUFsYsxqkt1XnVtSlpEWVHTmw CbVA== X-Received: by 10.224.40.136 with SMTP id k8mr44905570qae.28.1423512755751; Mon, 09 Feb 2015 12:12:35 -0800 (PST) Received: from localhost.localdomain ([179.159.212.40]) by mx.google.com with ESMTPSA id j6sm12885864qae.21.2015.02.09.12.12.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Feb 2015 12:12:34 -0800 (PST) From: Fabio Estevam To: bhelgaas@google.com Cc: robh@kernel.org, linux-pci@vger.kernel.org, Fabio Estevam Subject: [PATCH] PCI: xgene: Fix xgene_pcie_map_bus() return type Date: Mon, 9 Feb 2015 18:12:11 -0200 Message-Id: <1423512731-9625-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 From: Fabio Estevam Commit 350f8be5bb402a1 ("PCI: xgene: Convert to use generic config accessors") introduced the following build warnings: drivers/pci/host/pci-xgene.c:137:3: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:140:2: warning: return makes integer from pointer without a cast drivers/pci/host/pci-xgene.c:144:2: warning: initialization from incompatible pointer type drivers/pci/host/pci-xgene.c:144:2: warning: (near initialization for 'xgene_pcie_ops.map_bus') The .map_bus function should return 'void __iomem *' instead of 'int'. Reported-by: Olof's autobuilder Signed-off-by: Fabio Estevam --- drivers/pci/host/pci-xgene.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c index aab5547..22addb6 100644 --- a/drivers/pci/host/pci-xgene.c +++ b/drivers/pci/host/pci-xgene.c @@ -127,7 +127,7 @@ static bool xgene_pcie_hide_rc_bars(struct pci_bus *bus, int offset) return false; } -static int xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn, +static void __iomem *xgene_pcie_map_bus(struct pci_bus *bus, unsigned int devfn, int offset) { struct xgene_pcie_port *port = bus->sysdata;