From patchwork Mon Jul 27 22:12:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6876921 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CD651C05AC for ; Mon, 27 Jul 2015 22:12:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E34512071C for ; Mon, 27 Jul 2015 22:12:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D9707206BE for ; Mon, 27 Jul 2015 22:12:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754729AbbG0WMe (ORCPT ); Mon, 27 Jul 2015 18:12:34 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:37039 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754401AbbG0WMc (ORCPT ); Mon, 27 Jul 2015 18:12:32 -0400 Received: by igbpg9 with SMTP id pg9so97004354igb.0 for ; Mon, 27 Jul 2015 15:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; bh=XA4DiFlHJ75jnqeZtqCCWywkZYZU8Yr4Y6F0Yi9AVeQ=; b=eE83cJJdjkj+Ry9AFWProfcZTKA4dI0iuLBXRZ4Nlq5ASNTEXSAQiIW5SJqtlQEhua EY+LUCPR4FQWksZRuCtVBEBMW5QwCOLt6n8bgwItsYvSGSUIX6Cui3YtdYf+pMxeAqyT 0jbFOOyB5fe8GS+cuKj4yWjFnuciE+gfNCO+g6gdzwmZkoI2+i+QkvBems9v5x7j3bMy 3r0MJgbkwKdTT7oYkheO3ppStyxx73g//T6ywf3r+Hnvaq5pRHhFjgV2lvCZQ7zOZYP1 uCMW++GuZw0WftbxM5U5NPXPr5w3uuiwHayELPyq6K4aE6+XIgXYg5zO7DcNKuYQ+KSg flrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=XA4DiFlHJ75jnqeZtqCCWywkZYZU8Yr4Y6F0Yi9AVeQ=; b=DyZ6IN2QsfSt7HaiqUur1HetfFAcaPSezTbSttpWvPKNbI8VYRbvxKct2Y7Rk+tgjH HZGtjTODTzxumiMQ/m4WC5CLplM4xK/AacKmtrxgtlY18cEr0Tnvs0cPs2+hwzqmAVjn 91S59v4E9Xa1xYtGS1geq7sPif4MDOudV2MiXB41PWnByErN2+C9QYLuFR9aoSeDrtzL bSprhFUW/bMqSHDm23yo25F0My+fInbV3yxayf7Dno0b+q6G/f1lxhTQ4XXtXAAP0oCW CTtQW0pAL0BPbIFyj4yLrZpZ2CfxvSbijVQcVE6kbjUsuYtRAOyRunRjQIrRURtfBVAS Rf2g== X-Gm-Message-State: ALoCoQnHqcn2OVwEl34N+8Dr3/3qNfSu0UVIHCMGMwSWd0GBydQ3A/rIe7uLsybowlfAogcp2zzp X-Received: by 10.107.41.146 with SMTP id p140mr47683620iop.58.1438035151925; Mon, 27 Jul 2015 15:12:31 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id b140sm12866480ioe.9.2015.07.27.15.12.30 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 27 Jul 2015 15:12:30 -0700 (PDT) Subject: [PATCH] PCI: Remove unused "pci_probe" flags To: David Howells , Koichi Yasutake From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-am33-list@redhat.com, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Date: Mon, 27 Jul 2015 17:12:29 -0500 Message-ID: <20150727221228.24133.16599.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, 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 The following flags are only used on x86, but they got copied to FR-V, MN10300, and SuperH: PCI_PROBE_BIOS PCI_PROBE_CONF1 PCI_PROBE_CONF2 PCI_ASSIGN_ROMS PCI_NO_CHECKS PCI_BIOS_IRQ_SCAN PCI_ASSIGN_ALL_BUSSES FR-V and MN10300 do test for PCI_ASSIGN_ROMS, but they never set it, so it's dead code. Remove the unused flags above. Signed-off-by: Bjorn Helgaas --- arch/frv/mb93090-mb00/pci-frv.c | 8 -------- arch/frv/mb93090-mb00/pci-frv.h | 8 -------- arch/mn10300/unit-asb2305/pci-asb2305.c | 22 ++++++++++------------ arch/mn10300/unit-asb2305/pci-asb2305.h | 7 ------- arch/sh/drivers/pci/pci-sh4.h | 8 -------- 5 files changed, 10 insertions(+), 43 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c index 0635bd6..34bb4b1 100644 --- a/arch/frv/mb93090-mb00/pci-frv.c +++ b/arch/frv/mb93090-mb00/pci-frv.c @@ -175,14 +175,6 @@ static void __init pcibios_assign_resources(void) if (!r->start && r->end) pci_assign_resource(dev, idx); } - - if (pci_probe & PCI_ASSIGN_ROMS) { - r = &dev->resource[PCI_ROM_RESOURCE]; - r->end -= r->start; - r->start = 0; - if (r->end) - pci_assign_resource(dev, PCI_ROM_RESOURCE); - } } } diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h index a7e487fe..d51992f 100644 --- a/arch/frv/mb93090-mb00/pci-frv.h +++ b/arch/frv/mb93090-mb00/pci-frv.h @@ -14,14 +14,6 @@ #define DBG(x...) #endif -#define PCI_PROBE_BIOS 0x0001 -#define PCI_PROBE_CONF1 0x0002 -#define PCI_PROBE_CONF2 0x0004 -#define PCI_NO_CHECKS 0x0400 -#define PCI_ASSIGN_ROMS 0x1000 -#define PCI_BIOS_IRQ_SCAN 0x2000 -#define PCI_ASSIGN_ALL_BUSSES 0x4000 - extern unsigned int __nongpreldata pci_probe; /* pci-frv.c */ diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.c b/arch/mn10300/unit-asb2305/pci-asb2305.c index b5b036f..b7ab837 100644 --- a/arch/mn10300/unit-asb2305/pci-asb2305.c +++ b/arch/mn10300/unit-asb2305/pci-asb2305.c @@ -183,18 +183,16 @@ static int __init pcibios_assign_resources(void) struct pci_dev *dev = NULL; struct resource *r; - if (!(pci_probe & PCI_ASSIGN_ROMS)) { - /* Try to use BIOS settings for ROMs, otherwise let - pci_assign_unassigned_resources() allocate the new - addresses. */ - for_each_pci_dev(dev) { - r = &dev->resource[PCI_ROM_RESOURCE]; - if (!r->flags || !r->start) - continue; - if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) { - r->end -= r->start; - r->start = 0; - } + /* Try to use BIOS settings for ROMs, otherwise let + pci_assign_unassigned_resources() allocate the new + addresses. */ + for_each_pci_dev(dev) { + r = &dev->resource[PCI_ROM_RESOURCE]; + if (!r->flags || !r->start) + continue; + if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) { + r->end -= r->start; + r->start = 0; } } diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.h b/arch/mn10300/unit-asb2305/pci-asb2305.h index 9e17aca..96c484b 100644 --- a/arch/mn10300/unit-asb2305/pci-asb2305.h +++ b/arch/mn10300/unit-asb2305/pci-asb2305.h @@ -20,13 +20,6 @@ #define DBG(x...) #endif -#define PCI_PROBE_BIOS 1 -#define PCI_PROBE_CONF1 2 -#define PCI_PROBE_CONF2 4 -#define PCI_NO_CHECKS 0x400 -#define PCI_ASSIGN_ROMS 0x1000 -#define PCI_BIOS_IRQ_SCAN 0x2000 - extern unsigned int pci_probe; /* pci-asb2305.c */ diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h index cbf763b..0288efc 100644 --- a/arch/sh/drivers/pci/pci-sh4.h +++ b/arch/sh/drivers/pci/pci-sh4.h @@ -11,14 +11,6 @@ #include -/* startup values */ -#define PCI_PROBE_BIOS 1 -#define PCI_PROBE_CONF1 2 -#define PCI_PROBE_CONF2 4 -#define PCI_NO_CHECKS 0x400 -#define PCI_ASSIGN_ROMS 0x1000 -#define PCI_BIOS_IRQ_SCAN 0x2000 - #define SH4_PCICR 0x100 /* PCI Control Register */ #define SH4_PCICR_PREFIX 0xA5000000 /* CR prefix for write */ #define SH4_PCICR_FTO 0x00000400 /* TRDY/IRDY Enable */