From patchwork Mon Oct 27 07:48:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 39560 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3600A2118A for ; Mon, 27 Oct 2014 07:09:38 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf3838815lbv.0 for ; Mon, 27 Oct 2014 00:09:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=IQ1DXmA1sHe7PUsttHDXvl7JDX/mvbTwWY+VO52M8mA=; b=DfvEdDFn1hxuia+9FXCgeexyztysOSYcN0P+dAT7SlWVnbsKE/92TiODsucaMunPXc mxMXgige0hB3oXnAE/u/evUDBNv+X+ebR+/vCOpFSbk7Mf24Q2hmRFmRPeWgsUGLmym9 oEKAajI1xpXiQZiBD5a8zqKeceNnBY2qf+DP6IDuH2YxHjA4KjDQuB0zDM7UraFUvdoe Qifomb4I/dbA9dsXn7jis6HANYHiw3jLe3tfhGy45gPuxLRvB8l0ZJ0xn/1kkl5B65wH 95Om5VvJ5Y/u49+FHCbh79/WMEV1KDRpU/w7LOs+TlL2xVrRBPE6+Nr9uIRTB9IjYXgS QOXg== X-Gm-Message-State: ALoCoQn115lUmJfBfUi6WspaoWmmjrXyXaWYPy6+inuMl9hL+5sKQNjZukudKoOEitAkvKwQBrS9 X-Received: by 10.180.83.134 with SMTP id q6mr3540902wiy.7.1414393776987; Mon, 27 Oct 2014 00:09:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.3.170 with SMTP id d10ls622553lad.75.gmail; Mon, 27 Oct 2014 00:09:36 -0700 (PDT) X-Received: by 10.112.77.74 with SMTP id q10mr21192590lbw.66.1414393776720; Mon, 27 Oct 2014 00:09:36 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id u2si18415696laa.120.2014.10.27.00.09.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Oct 2014 00:09:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so5115891lbv.21 for ; Mon, 27 Oct 2014 00:09:36 -0700 (PDT) X-Received: by 10.112.97.135 with SMTP id ea7mr21553404lbb.46.1414393776305; Mon, 27 Oct 2014 00:09:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp242547lbz; Mon, 27 Oct 2014 00:09:35 -0700 (PDT) X-Received: by 10.68.200.100 with SMTP id jr4mr22528016pbc.69.1414393774642; Mon, 27 Oct 2014 00:09:34 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id se6si9904331pac.1.2014.10.27.00.09.33 for ; Mon, 27 Oct 2014 00:09:34 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752390AbaJ0HJK (ORCPT + 26 others); Mon, 27 Oct 2014 03:09:10 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:10253 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752178AbaJ0HIX (ORCPT ); Mon, 27 Oct 2014 03:08:23 -0400 Received: from 172.24.2.119 (EHLO szxeml409-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CBJ05372; Mon, 27 Oct 2014 15:07:34 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml409-hub.china.huawei.com (10.82.67.136) with Microsoft SMTP Server id 14.3.158.1; Mon, 27 Oct 2014 15:07:24 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , , Xinwei Hu , Wuyun , , Russell King , Thomas Gleixner , "Thierry Reding" , Thomas Petazzoni , Yijing Wang Subject: [PATCH 09/10] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() Date: Mon, 27 Oct 2014 15:48:46 +0800 Message-ID: <1414396127-30023-10-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1414396127-30023-1-git-send-email-wangyijing@huawei.com> References: <1414396127-30023-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangyijing@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , MSI controller has been saved in pci_sys_data, now we can clean up pcibios_add_bus() and pcibios_remove_bus() in arm, and use pcibios_msi_controller() to get MSI controller pointer. Signed-off-by: Yijing Wang --- arch/arm/include/asm/mach/pci.h | 4 ---- arch/arm/kernel/bios32.c | 16 ---------------- 2 files changed, 0 insertions(+), 20 deletions(-) diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 8144d61..8292b5f 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -39,8 +39,6 @@ struct hw_pci { resource_size_t start, resource_size_t size, resource_size_t align); - void (*add_bus)(struct pci_bus *bus); - void (*remove_bus)(struct pci_bus *bus); }; /* @@ -71,8 +69,6 @@ struct pci_sys_data { resource_size_t start, resource_size_t size, resource_size_t align); - void (*add_bus)(struct pci_bus *bus); - void (*remove_bus)(struct pci_bus *bus); void *private_data; /* platform controller private data */ }; diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 073229f..32301fc 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -369,20 +369,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) } EXPORT_SYMBOL(pcibios_fixup_bus); -void pcibios_add_bus(struct pci_bus *bus) -{ - struct pci_sys_data *sys = bus->sysdata; - if (sys->add_bus) - sys->add_bus(bus); -} - -void pcibios_remove_bus(struct pci_bus *bus) -{ - struct pci_sys_data *sys = bus->sysdata; - if (sys->remove_bus) - sys->remove_bus(bus); -} - /* * Swizzle the device pin each time we cross a bridge. If a platform does * not provide a swizzle function, we perform the standard PCI swizzling. @@ -487,8 +473,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, sys->swizzle = hw->swizzle; sys->map_irq = hw->map_irq; sys->align_resource = hw->align_resource; - sys->add_bus = hw->add_bus; - sys->remove_bus = hw->remove_bus; INIT_LIST_HEAD(&sys->resources); if (hw->private_data)