From patchwork Tue Aug 5 16:11:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Minter X-Patchwork-Id: 4680461 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 111D4C0338 for ; Tue, 5 Aug 2014 16:12:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A645201BA for ; Tue, 5 Aug 2014 16:12:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7EFB201CE for ; Tue, 5 Aug 2014 16:12:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755021AbaHEQMV (ORCPT ); Tue, 5 Aug 2014 12:12:21 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:44568 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754797AbaHEQMP (ORCPT ); Tue, 5 Aug 2014 12:12:15 -0400 Received: by mail-wg0-f51.google.com with SMTP id b13so1256830wgh.34 for ; Tue, 05 Aug 2014 09:12:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=myport.ac.uk; s=google-20130730; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=WzonHj7XXNFOU2AoqaYKF5jDL/FY9nBGrvZ/qt1ETQ8=; b=j1oruYsbQlI3N9tsQU8ZKwPcp0enEMjl/e7Dm9S4yKhVqWhPPS/quY4+GuWbpSYX10 DKPyFzp9DbeZhg6HAfRjc1CCF45dwf+bLEl24OxWe3ttaZN7J3w1mkdMhTTrdBZQc7j5 DjkwCU3Mn/DYN8T1/iohQMNFQJ5Ye0yGFCRY8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=WzonHj7XXNFOU2AoqaYKF5jDL/FY9nBGrvZ/qt1ETQ8=; b=haa0zaEps7PhP2nt+yfrU4sl5peN17br1p9r8IsEhVBjhT1m535tiJ+TG8FcaZ8+Nu V8M3j5CqFWHHacDLv72dLXDu9XBtMMT9I21FV4ielBfwizrXJTcCgwozL50x4k/ioteo sZrr9Ndgb5RJzhE3ud/YCGuqCRfpnKIGHnjuc8AOul0mPj/j253IqBDPJi4sQVnNaoea ZvHPy1dR49Bv71ZaJ2YKEr96Fgr8M2QALDwcgRaca2pTbMg72D7APi4idNdlNjKc3uEQ 79Wk5eeRr7KkpvOABX/kDTRBHkyWdqBWHnpzQTDFLv3nVJ5fVau3Z18uhgPhZqAzQweJ tk5Q== X-Gm-Message-State: ALoCoQl+ECZrvCLdnhl+GircFQ/ObtN0tE0GT3wWduDlPsbtefGx/6OsskOPZO85GdWxsCgROy8v X-Received: by 10.180.12.239 with SMTP id b15mr40401142wic.75.1407255134298; Tue, 05 Aug 2014 09:12:14 -0700 (PDT) Received: from localhost.xy01.xyratex.com (xyratex195.xyratex.com. [194.131.166.195]) by mx.google.com with ESMTPSA id e3sm5169369wjp.4.2014.08.05.09.12.13 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Aug 2014 09:12:13 -0700 (PDT) From: matthew_minter@xyratex.com To: bhelgaas@google.com, linux-pci@vger.kernel.org Cc: matthew_minter Subject: [PATCH 22/22] Tidy up including documentation and messages Date: Tue, 5 Aug 2014 17:11:23 +0100 Message-Id: <1407255083-9356-23-git-send-email-matthew_minter@xyratex.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1407255083-9356-1-git-send-email-matthew_minter@xyratex.com> References: <1407255083-9356-1-git-send-email-matthew_minter@xyratex.com> 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,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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: matthew_minter --- drivers/of/of_pci_irq.c | 2 +- drivers/pci/setup-irq.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c index 1710d9d..205eb7a 100644 --- a/drivers/of/of_pci_irq.c +++ b/drivers/of/of_pci_irq.c @@ -97,7 +97,7 @@ EXPORT_SYMBOL_GPL(of_irq_parse_pci); * @pin: PCI irq pin number; passed when used as map_irq callback. Unused * * @slot and @pin are unused, but included in the function so that this - * function can be used directly as the map_irq callback to pci_fixup_irqs(). + * function can be used directly as the map_irq callback to pdev_assign_irq(). */ int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin) { diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c index 7bb4356..203bf7e 100644 --- a/drivers/pci/setup-irq.c +++ b/drivers/pci/setup-irq.c @@ -31,7 +31,7 @@ void pdev_assign_irq(struct pci_dev *dev, int irq = 0; if (!map_irq) { - dev_dbg(&dev->dev, "map_irq not provided by arch\n", dev->irq); + dev_dbg(&dev->dev, "runtime irq mapping not provided by arch\n"); return; } @@ -46,7 +46,7 @@ void pdev_assign_irq(struct pci_dev *dev, if (pin > 4) pin = 1; - if (pin != 0) { + if (pin) { /* Follow the chain of bridges, swizzling as we go. */ if(swizzle) slot = (*swizzle)(dev, &pin); @@ -57,7 +57,7 @@ void pdev_assign_irq(struct pci_dev *dev, irq = 0; } - dev_dbg(&dev->dev, "fixup irq: got %d\n", dev->irq); + dev_dbg(&dev->dev, "assign irq: got %d\n", dev->irq); dev->irq = irq; /* Always tell the device, so the driver knows what is the real IRQ to use; the device does not use it. */