From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Subject: Re: [PATCH v3 09/27] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() Date: Thu, 23 Oct 2014 14:39:35 +0800 Message-ID: <5448A2A7.9090407@huawei.com> References: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> <1413342435-7876-10-git-send-email-wangyijing@huawei.com> <20141023053858.GD11770@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from szxga02-in.huawei.com ([119.145.14.65]:33886 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750930AbaJWGj6 (ORCPT ); Thu, 23 Oct 2014 02:39:58 -0400 In-Reply-To: <20141023053858.GD11770@google.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Xinwei Hu , Wuyun , linux-arm-kernel@lists.infradead.org, Russell King , linux-arch@vger.kernel.org, arnab.basu@freescale.com, Bharat.Bhushan@freescale.com, x86@kernel.org, Arnd Bergmann , Thomas Gleixner , Konrad Rzeszutek Wilk , xen-devel@lists.xenproject.org, Joerg Roedel , iommu@lists.linux-foundation.org, linux-mips@linux-mips.org, Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Sebastian Ott , Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org, Chris Metcalf >> /* >> * 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. >> @@ -478,8 +464,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) > > What do the core changes below have to do with the ARM changes above? > They should be a separate patch unless they can't be separated. Hm, it's not the thing have to do, because the changes below is only used by arm arch, so I put it here together. It's ok to split the core changes out to another one. > >> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c >> index f11108c..56e54ad 100644 >> --- a/drivers/pci/msi.c >> +++ b/drivers/pci/msi.c >> @@ -32,12 +32,10 @@ int pci_msi_ignore_mask; >> >> int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> { >> - struct msi_chip *chip = dev->bus->msi; >> + struct msi_chip *chip; >> int err; >> >> - if (!chip) >> - chip = pci_msi_chip(dev->bus); >> - >> + chip = pci_msi_chip(dev->bus); >> if (!chip || !chip->setup_irq) >> return -EINVAL; >> >> @@ -51,10 +49,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> void __weak arch_teardown_msi_irq(unsigned int irq) >> { >> struct msi_desc *entry = irq_get_msi_desc(irq); >> - struct msi_chip *chip = entry->dev->bus->msi; >> - >> - if (!chip) >> - chip = pci_msi_chip(entry->dev->bus); >> + struct msi_chip *chip = pci_msi_chip(entry->dev->bus); >> >> if (!chip || !chip->teardown_irq) >> return; >> -- >> 1.7.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . > -- Thanks! Yijing From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga02-in.huawei.com ([119.145.14.65]:33886 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750930AbaJWGj6 (ORCPT ); Thu, 23 Oct 2014 02:39:58 -0400 Message-ID: <5448A2A7.9090407@huawei.com> Date: Thu, 23 Oct 2014 14:39:35 +0800 From: Yijing Wang MIME-Version: 1.0 Subject: Re: [PATCH v3 09/27] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() References: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> <1413342435-7876-10-git-send-email-wangyijing@huawei.com> <20141023053858.GD11770@google.com> In-Reply-To: <20141023053858.GD11770@google.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Xinwei Hu , Wuyun , linux-arm-kernel@lists.infradead.org, Russell King , linux-arch@vger.kernel.org, arnab.basu@freescale.com, Bharat.Bhushan@freescale.com, x86@kernel.org, Arnd Bergmann , Thomas Gleixner , Konrad Rzeszutek Wilk , xen-devel@lists.xenproject.org, Joerg Roedel , iommu@lists.linux-foundation.org, linux-mips@linux-mips.org, Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Sebastian Ott , Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org, Chris Metcalf , Ralf Baechle , Lucas Stach , David Vrabel , Sergei Shtylyov , Michael Ellerman , Thierry Reding , Thomas Petazzoni , Liviu Dudau Message-ID: <20141023063935.t1FQQX3zVRBk4keeoOKfD9XdCzCDGm9egL7NhHtmnfY@z> >> /* >> * 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. >> @@ -478,8 +464,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) > > What do the core changes below have to do with the ARM changes above? > They should be a separate patch unless they can't be separated. Hm, it's not the thing have to do, because the changes below is only used by arm arch, so I put it here together. It's ok to split the core changes out to another one. > >> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c >> index f11108c..56e54ad 100644 >> --- a/drivers/pci/msi.c >> +++ b/drivers/pci/msi.c >> @@ -32,12 +32,10 @@ int pci_msi_ignore_mask; >> >> int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> { >> - struct msi_chip *chip = dev->bus->msi; >> + struct msi_chip *chip; >> int err; >> >> - if (!chip) >> - chip = pci_msi_chip(dev->bus); >> - >> + chip = pci_msi_chip(dev->bus); >> if (!chip || !chip->setup_irq) >> return -EINVAL; >> >> @@ -51,10 +49,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> void __weak arch_teardown_msi_irq(unsigned int irq) >> { >> struct msi_desc *entry = irq_get_msi_desc(irq); >> - struct msi_chip *chip = entry->dev->bus->msi; >> - >> - if (!chip) >> - chip = pci_msi_chip(entry->dev->bus); >> + struct msi_chip *chip = pci_msi_chip(entry->dev->bus); >> >> if (!chip || !chip->teardown_irq) >> return; >> -- >> 1.7.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . > -- Thanks! Yijing From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Thu, 23 Oct 2014 06:39:35 +0000 Subject: Re: [PATCH v3 09/27] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() Message-Id: <5448A2A7.9090407@huawei.com> List-Id: References: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> <1413342435-7876-10-git-send-email-wangyijing@huawei.com> <20141023053858.GD11770@google.com> In-Reply-To: <20141023053858.GD11770@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Xinwei Hu , Wuyun , linux-arm-kernel@lists.infradead.org, Russell King , linux-arch@vger.kernel.org, arnab.basu@freescale.com, Bharat.Bhushan@freescale.com, x86@kernel.org, Arnd Bergmann , Thomas Gleixner , Konrad Rzeszutek Wilk , xen-devel@lists.xenproject.org, Joerg Roedel , iommu@lists.linux-foundation.org, linux-mips@linux-mips.org, Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Sebastian Ott , Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org, Chris Metcalf , Ralf Baechle , Lucas Stach , David Vrabel , Sergei Shtylyov , Michael Ellerman , Thierry Reding , Thomas Petazzoni , Liviu Dudau >> /* >> * 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. >> @@ -478,8 +464,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) > > What do the core changes below have to do with the ARM changes above? > They should be a separate patch unless they can't be separated. Hm, it's not the thing have to do, because the changes below is only used by arm arch, so I put it here together. It's ok to split the core changes out to another one. > >> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c >> index f11108c..56e54ad 100644 >> --- a/drivers/pci/msi.c >> +++ b/drivers/pci/msi.c >> @@ -32,12 +32,10 @@ int pci_msi_ignore_mask; >> >> int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> { >> - struct msi_chip *chip = dev->bus->msi; >> + struct msi_chip *chip; >> int err; >> >> - if (!chip) >> - chip = pci_msi_chip(dev->bus); >> - >> + chip = pci_msi_chip(dev->bus); >> if (!chip || !chip->setup_irq) >> return -EINVAL; >> >> @@ -51,10 +49,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> void __weak arch_teardown_msi_irq(unsigned int irq) >> { >> struct msi_desc *entry = irq_get_msi_desc(irq); >> - struct msi_chip *chip = entry->dev->bus->msi; >> - >> - if (!chip) >> - chip = pci_msi_chip(entry->dev->bus); >> + struct msi_chip *chip = pci_msi_chip(entry->dev->bus); >> >> if (!chip || !chip->teardown_irq) >> return; >> -- >> 1.7.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . > -- Thanks! Yijing From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 23 Oct 2014 08:40:13 +0200 (CEST) Received: from szxga02-in.huawei.com ([119.145.14.65]:10447 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27011440AbaJWGkKNqJVD (ORCPT ); Thu, 23 Oct 2014 08:40:10 +0200 Received: from 172.24.2.119 (EHLO szxeml408-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CBD42120; Thu, 23 Oct 2014 14:39:48 +0800 (CST) Received: from [127.0.0.1] (10.177.27.212) by szxeml408-hub.china.huawei.com (10.82.67.95) with Microsoft SMTP Server id 14.3.158.1; Thu, 23 Oct 2014 14:39:39 +0800 Message-ID: <5448A2A7.9090407@huawei.com> Date: Thu, 23 Oct 2014 14:39:35 +0800 From: Yijing Wang User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Bjorn Helgaas CC: , , Xinwei Hu , Wuyun , , Russell King , , , , , Arnd Bergmann , Thomas Gleixner , "Konrad Rzeszutek Wilk" , , Joerg Roedel , , , Benjamin Herrenschmidt , , , Sebastian Ott , "Tony Luck" , , "David S. Miller" , , Chris Metcalf , Ralf Baechle , Lucas Stach , David Vrabel , "Sergei Shtylyov" , Michael Ellerman , Thierry Reding , "Thomas Petazzoni" , Liviu Dudau Subject: Re: [PATCH v3 09/27] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() References: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> <1413342435-7876-10-git-send-email-wangyijing@huawei.com> <20141023053858.GD11770@google.com> In-Reply-To: <20141023053858.GD11770@google.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.27.212] X-CFilter-Loop: Reflected Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 43528 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: wangyijing@huawei.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips >> /* >> * 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. >> @@ -478,8 +464,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) > > What do the core changes below have to do with the ARM changes above? > They should be a separate patch unless they can't be separated. Hm, it's not the thing have to do, because the changes below is only used by arm arch, so I put it here together. It's ok to split the core changes out to another one. > >> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c >> index f11108c..56e54ad 100644 >> --- a/drivers/pci/msi.c >> +++ b/drivers/pci/msi.c >> @@ -32,12 +32,10 @@ int pci_msi_ignore_mask; >> >> int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> { >> - struct msi_chip *chip = dev->bus->msi; >> + struct msi_chip *chip; >> int err; >> >> - if (!chip) >> - chip = pci_msi_chip(dev->bus); >> - >> + chip = pci_msi_chip(dev->bus); >> if (!chip || !chip->setup_irq) >> return -EINVAL; >> >> @@ -51,10 +49,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> void __weak arch_teardown_msi_irq(unsigned int irq) >> { >> struct msi_desc *entry = irq_get_msi_desc(irq); >> - struct msi_chip *chip = entry->dev->bus->msi; >> - >> - if (!chip) >> - chip = pci_msi_chip(entry->dev->bus); >> + struct msi_chip *chip = pci_msi_chip(entry->dev->bus); >> >> if (!chip || !chip->teardown_irq) >> return; >> -- >> 1.7.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . > -- Thanks! Yijing From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [119.145.14.65]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id D07941A00D1 for ; Thu, 23 Oct 2014 17:40:20 +1100 (AEDT) Message-ID: <5448A2A7.9090407@huawei.com> Date: Thu, 23 Oct 2014 14:39:35 +0800 From: Yijing Wang MIME-Version: 1.0 To: Bjorn Helgaas Subject: Re: [PATCH v3 09/27] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() References: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> <1413342435-7876-10-git-send-email-wangyijing@huawei.com> <20141023053858.GD11770@google.com> In-Reply-To: <20141023053858.GD11770@google.com> Content-Type: text/plain; charset="ISO-8859-1" Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, linux-pci@vger.kernel.org, Bharat.Bhushan@freescale.com, Thierry Reding , sparclinux@vger.kernel.org, linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, Russell King , Joerg Roedel , x86@kernel.org, Sebastian Ott , xen-devel@lists.xenproject.org, arnab.basu@freescale.com, Liviu Dudau , Arnd Bergmann , Konrad Rzeszutek Wilk , Chris Metcalf , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , Xinwei Hu , Tony Luck , Sergei Shtylyov , linux-kernel@vger.kernel.org, Ralf Baechle , iommu@lists.linux-foundation.org, David Vrabel , Wuyun , linuxppc-dev@lists.ozlabs.org, "David S. Miller" , Lucas Stach List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , >> /* >> * 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. >> @@ -478,8 +464,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) > > What do the core changes below have to do with the ARM changes above? > They should be a separate patch unless they can't be separated. Hm, it's not the thing have to do, because the changes below is only used by arm arch, so I put it here together. It's ok to split the core changes out to another one. > >> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c >> index f11108c..56e54ad 100644 >> --- a/drivers/pci/msi.c >> +++ b/drivers/pci/msi.c >> @@ -32,12 +32,10 @@ int pci_msi_ignore_mask; >> >> int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> { >> - struct msi_chip *chip = dev->bus->msi; >> + struct msi_chip *chip; >> int err; >> >> - if (!chip) >> - chip = pci_msi_chip(dev->bus); >> - >> + chip = pci_msi_chip(dev->bus); >> if (!chip || !chip->setup_irq) >> return -EINVAL; >> >> @@ -51,10 +49,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> void __weak arch_teardown_msi_irq(unsigned int irq) >> { >> struct msi_desc *entry = irq_get_msi_desc(irq); >> - struct msi_chip *chip = entry->dev->bus->msi; >> - >> - if (!chip) >> - chip = pci_msi_chip(entry->dev->bus); >> + struct msi_chip *chip = pci_msi_chip(entry->dev->bus); >> >> if (!chip || !chip->teardown_irq) >> return; >> -- >> 1.7.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . > -- Thanks! Yijing From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Thu, 23 Oct 2014 06:39:35 +0000 Subject: Re: [PATCH v3 09/27] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() Message-Id: <5448A2A7.9090407@huawei.com> List-Id: References: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> <1413342435-7876-10-git-send-email-wangyijing@huawei.com> <20141023053858.GD11770@google.com> In-Reply-To: <20141023053858.GD11770@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Xinwei Hu , Wuyun , linux-arm-kernel@lists.infradead.org, Russell King , linux-arch@vger.kernel.org, arnab.basu@freescale.com, Bharat.Bhushan@freescale.com, x86@kernel.org, Arnd Bergmann , Thomas Gleixner , Konrad Rzeszutek Wilk , xen-devel@lists.xenproject.org, Joerg Roedel , iommu@lists.linux-foundation.org, linux-mips@linux-mips.org, Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Sebastian Ott , Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org, Chris Metcalf >> /* >> * 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. >> @@ -478,8 +464,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) > > What do the core changes below have to do with the ARM changes above? > They should be a separate patch unless they can't be separated. Hm, it's not the thing have to do, because the changes below is only used by arm arch, so I put it here together. It's ok to split the core changes out to another one. > >> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c >> index f11108c..56e54ad 100644 >> --- a/drivers/pci/msi.c >> +++ b/drivers/pci/msi.c >> @@ -32,12 +32,10 @@ int pci_msi_ignore_mask; >> >> int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> { >> - struct msi_chip *chip = dev->bus->msi; >> + struct msi_chip *chip; >> int err; >> >> - if (!chip) >> - chip = pci_msi_chip(dev->bus); >> - >> + chip = pci_msi_chip(dev->bus); >> if (!chip || !chip->setup_irq) >> return -EINVAL; >> >> @@ -51,10 +49,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> void __weak arch_teardown_msi_irq(unsigned int irq) >> { >> struct msi_desc *entry = irq_get_msi_desc(irq); >> - struct msi_chip *chip = entry->dev->bus->msi; >> - >> - if (!chip) >> - chip = pci_msi_chip(entry->dev->bus); >> + struct msi_chip *chip = pci_msi_chip(entry->dev->bus); >> >> if (!chip || !chip->teardown_irq) >> return; >> -- >> 1.7.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . > -- Thanks! Yijing From mboxrd@z Thu Jan 1 00:00:00 1970 From: wangyijing@huawei.com (Yijing Wang) Date: Thu, 23 Oct 2014 14:39:35 +0800 Subject: [PATCH v3 09/27] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() In-Reply-To: <20141023053858.GD11770@google.com> References: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> <1413342435-7876-10-git-send-email-wangyijing@huawei.com> <20141023053858.GD11770@google.com> Message-ID: <5448A2A7.9090407@huawei.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org >> /* >> * 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. >> @@ -478,8 +464,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) > > What do the core changes below have to do with the ARM changes above? > They should be a separate patch unless they can't be separated. Hm, it's not the thing have to do, because the changes below is only used by arm arch, so I put it here together. It's ok to split the core changes out to another one. > >> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c >> index f11108c..56e54ad 100644 >> --- a/drivers/pci/msi.c >> +++ b/drivers/pci/msi.c >> @@ -32,12 +32,10 @@ int pci_msi_ignore_mask; >> >> int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> { >> - struct msi_chip *chip = dev->bus->msi; >> + struct msi_chip *chip; >> int err; >> >> - if (!chip) >> - chip = pci_msi_chip(dev->bus); >> - >> + chip = pci_msi_chip(dev->bus); >> if (!chip || !chip->setup_irq) >> return -EINVAL; >> >> @@ -51,10 +49,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) >> void __weak arch_teardown_msi_irq(unsigned int irq) >> { >> struct msi_desc *entry = irq_get_msi_desc(irq); >> - struct msi_chip *chip = entry->dev->bus->msi; >> - >> - if (!chip) >> - chip = pci_msi_chip(entry->dev->bus); >> + struct msi_chip *chip = pci_msi_chip(entry->dev->bus); >> >> if (!chip || !chip->teardown_irq) >> return; >> -- >> 1.7.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo at vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . > -- Thanks! Yijing