From patchwork Tue Aug 5 16:11:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Minter X-Patchwork-Id: 4680351 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 09BBD9F3FF for ; Tue, 5 Aug 2014 16:12:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41D0E2017D for ; Tue, 5 Aug 2014 16:12:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74BE02017A for ; Tue, 5 Aug 2014 16:12:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755140AbaHEQML (ORCPT ); Tue, 5 Aug 2014 12:12:11 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:35922 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753710AbaHEQMG (ORCPT ); Tue, 5 Aug 2014 12:12:06 -0400 Received: by mail-wi0-f170.google.com with SMTP id f8so8234293wiw.3 for ; Tue, 05 Aug 2014 09:12:05 -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=QWz1xy88uC8Ndijj8n+NWj8cMGIy6e0AvsWCSNloYe8=; b=CgKHTyGixcM7atZfMMfdBhteicbK6kEN2lGgueVMvSJXPmVtg9tXNSLwKEM4EDfvwt NpNVo2wP36lPqyyLWoley3xEO9Wgs9ztv2EcVYCdROYaIoFBxIzIZUFSpuDeFMLTppuo XsiiOfIfeita+O/Ed1iiBl5dSnwPiMCdxqxzY= 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=QWz1xy88uC8Ndijj8n+NWj8cMGIy6e0AvsWCSNloYe8=; b=cHf8JRKywlbWpipJi86TVyWAycuMLszGY39f7ssNIJT+v5rsoB+ug36VOANpDfm/N7 X3brSL8lukoH4YU75ur0aHKRIgOvqNONBKzHcG/fnRMzWh6ut/yn/saNakzwsbcyx7+C 4gi/xAaIgu+fIGCsSQtjjfnQoLxdtRr8xhpM6Xk/ZkB3qbAOfEWwMMwBxWPIJJRwK8WO RkQuiZGfTVLVn2M1u8wLIbmFyJHIq/lPgzZz4U5DExaU79/zbPtyLXfHTUuJqHpH+k/X 5B8Jz2ZgSi95QCxJRb7JFjT4sranmatS8s39bbCnASdTONPvb43e65tktc9vE+Ev+Euk F5Ow== X-Gm-Message-State: ALoCoQlAmsU8BLmE+n0ivnwl7LdtroRKP4CyZb5rHHxqqAka4FwJXL+nNyD/XURA/SXDO8YYKq05 X-Received: by 10.180.19.227 with SMTP id i3mr41511839wie.45.1407255124656; Tue, 05 Aug 2014 09:12:04 -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.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Aug 2014 09:12:03 -0700 (PDT) From: matthew_minter@xyratex.com To: bhelgaas@google.com, linux-pci@vger.kernel.org Cc: matthew_minter Subject: [PATCH 10/22] Added (untested) support to cris architecture to accomodate new irq init code Date: Tue, 5 Aug 2014 17:11:11 +0100 Message-Id: <1407255083-9356-11-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=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 From: matthew_minter --- arch/cris/arch-v32/drivers/pci/bios.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c index 64a5fb9..d04ecc8 100644 --- a/arch/cris/arch-v32/drivers/pci/bios.c +++ b/arch/cris/arch-v32/drivers/pci/bios.c @@ -80,20 +80,16 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask) return 0; } -int pcibios_enable_irq(struct pci_dev *dev) +int pcibios_enable_irq(struct pci_dev *dev, u8 slot, u8 pin) { dev->irq = EXT_INTR_VECT; return 0; } -int pcibios_enable_device(struct pci_dev *dev, int mask) +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { - int err; - - if ((err = pcibios_enable_resources(dev, mask)) < 0) - return err; - - if (!dev->msi_enabled) - pcibios_enable_irq(dev); + bridge->swizzle_irq = NULL; + bridge->map_irq = pcibios_enable_irq; return 0; } +