From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: Re: [PATCH V7 07/11] pci, acpi: Handle ACPI companion assignment. Date: Thu, 12 May 2016 07:08:36 -0500 Message-ID: <20160512120836.GF28812@localhost> References: <1462893601-8937-1-git-send-email-tn@semihalf.com> <1462893601-8937-8-git-send-email-tn@semihalf.com> <20160511101101.GA16101@red-moon> <20160511224314.GD28812@localhost> <57345FDF.4000804@semihalf.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail.kernel.org ([198.145.29.136]:35349 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751338AbcELMIk (ORCPT ); Thu, 12 May 2016 08:08:40 -0400 Content-Disposition: inline In-Reply-To: <57345FDF.4000804@semihalf.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Tomasz Nowicki Cc: "Rafael J. Wysocki" , Lorenzo Pieralisi , Arnd Bergmann , Will Deacon , Catalin Marinas , Hanjun Guo , Sinan Kaya , jchandra@broadcom.com, robert.richter@caviumnetworks.com, Marcin Wojtas , Liviu.Dudau@arm.com, David Daney , wangyijing@huawei.com, Suravee Suthikulanit , Mark Salter , Linux PCI , "linux-arm-kernel@lists.infradead.org" , ACPI Devel Maling List , Linux Kernel Mailing List , "linaro-acpi@lists.linaro.org" , Jon Masters , Andrea Gallo On Thu, May 12, 2016 at 12:50:07PM +0200, Tomasz Nowicki wrote: > On 12.05.2016 00:43, Bjorn Helgaas wrote: > >@@ -70,9 +71,11 @@ struct pci_config_window *pci_ecam_create(struct device *dev, > > cfg->res.flags = IORESOURCE_MEM | IORESOURCE_BUSY; > > cfg->res.name = "PCI ECAM"; > > > >- err = request_resource(&iomem_resource, &cfg->res); > >- if (err) { > >- dev_err(dev, "request ECAM res %pR failed\n", &cfg->res); > >+ conflict = request_resource(&iomem_resource, &cfg->res); > > We need request_resource_conflict here then: > - conflict = request_resource(&iomem_resource, &cfg->res); > + conflict = request_resource_conflict(&iomem_resource, &cfg->res); Whoops, fixed, thanks! From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753179AbcELMIm (ORCPT ); Thu, 12 May 2016 08:08:42 -0400 Received: from mail.kernel.org ([198.145.29.136]:35349 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751338AbcELMIk (ORCPT ); Thu, 12 May 2016 08:08:40 -0400 Date: Thu, 12 May 2016 07:08:36 -0500 From: Bjorn Helgaas To: Tomasz Nowicki Cc: "Rafael J. Wysocki" , Lorenzo Pieralisi , Arnd Bergmann , Will Deacon , Catalin Marinas , Hanjun Guo , Sinan Kaya , jchandra@broadcom.com, robert.richter@caviumnetworks.com, Marcin Wojtas , Liviu.Dudau@arm.com, David Daney , wangyijing@huawei.com, Suravee Suthikulanit , Mark Salter , Linux PCI , "linux-arm-kernel@lists.infradead.org" , ACPI Devel Maling List , Linux Kernel Mailing List , "linaro-acpi@lists.linaro.org" , Jon Masters , Andrea Gallo , Duc Dang , jeremy.linton@arm.com, liudongdong3@huawei.com, Christopher Covington Subject: Re: [PATCH V7 07/11] pci, acpi: Handle ACPI companion assignment. Message-ID: <20160512120836.GF28812@localhost> References: <1462893601-8937-1-git-send-email-tn@semihalf.com> <1462893601-8937-8-git-send-email-tn@semihalf.com> <20160511101101.GA16101@red-moon> <20160511224314.GD28812@localhost> <57345FDF.4000804@semihalf.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <57345FDF.4000804@semihalf.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 12, 2016 at 12:50:07PM +0200, Tomasz Nowicki wrote: > On 12.05.2016 00:43, Bjorn Helgaas wrote: > >@@ -70,9 +71,11 @@ struct pci_config_window *pci_ecam_create(struct device *dev, > > cfg->res.flags = IORESOURCE_MEM | IORESOURCE_BUSY; > > cfg->res.name = "PCI ECAM"; > > > >- err = request_resource(&iomem_resource, &cfg->res); > >- if (err) { > >- dev_err(dev, "request ECAM res %pR failed\n", &cfg->res); > >+ conflict = request_resource(&iomem_resource, &cfg->res); > > We need request_resource_conflict here then: > - conflict = request_resource(&iomem_resource, &cfg->res); > + conflict = request_resource_conflict(&iomem_resource, &cfg->res); Whoops, fixed, thanks! From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Thu, 12 May 2016 07:08:36 -0500 From: Bjorn Helgaas To: Tomasz Nowicki Cc: "Rafael J. Wysocki" , Lorenzo Pieralisi , Arnd Bergmann , Will Deacon , Catalin Marinas , Hanjun Guo , Sinan Kaya , jchandra@broadcom.com, robert.richter@caviumnetworks.com, Marcin Wojtas , Liviu.Dudau@arm.com, David Daney , wangyijing@huawei.com, Suravee Suthikulanit , Mark Salter , Linux PCI , "linux-arm-kernel@lists.infradead.org" , ACPI Devel Maling List , Linux Kernel Mailing List , "linaro-acpi@lists.linaro.org" , Jon Masters , Andrea Gallo , Duc Dang , jeremy.linton@arm.com, liudongdong3@huawei.com, Christopher Covington Subject: Re: [PATCH V7 07/11] pci, acpi: Handle ACPI companion assignment. Message-ID: <20160512120836.GF28812@localhost> References: <1462893601-8937-1-git-send-email-tn@semihalf.com> <1462893601-8937-8-git-send-email-tn@semihalf.com> <20160511101101.GA16101@red-moon> <20160511224314.GD28812@localhost> <57345FDF.4000804@semihalf.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <57345FDF.4000804@semihalf.com> Sender: linux-acpi-owner@vger.kernel.org List-ID: On Thu, May 12, 2016 at 12:50:07PM +0200, Tomasz Nowicki wrote: > On 12.05.2016 00:43, Bjorn Helgaas wrote: > >@@ -70,9 +71,11 @@ struct pci_config_window *pci_ecam_create(struct device *dev, > > cfg->res.flags = IORESOURCE_MEM | IORESOURCE_BUSY; > > cfg->res.name = "PCI ECAM"; > > > >- err = request_resource(&iomem_resource, &cfg->res); > >- if (err) { > >- dev_err(dev, "request ECAM res %pR failed\n", &cfg->res); > >+ conflict = request_resource(&iomem_resource, &cfg->res); > > We need request_resource_conflict here then: > - conflict = request_resource(&iomem_resource, &cfg->res); > + conflict = request_resource_conflict(&iomem_resource, &cfg->res); Whoops, fixed, thanks! From mboxrd@z Thu Jan 1 00:00:00 1970 From: helgaas@kernel.org (Bjorn Helgaas) Date: Thu, 12 May 2016 07:08:36 -0500 Subject: [PATCH V7 07/11] pci, acpi: Handle ACPI companion assignment. In-Reply-To: <57345FDF.4000804@semihalf.com> References: <1462893601-8937-1-git-send-email-tn@semihalf.com> <1462893601-8937-8-git-send-email-tn@semihalf.com> <20160511101101.GA16101@red-moon> <20160511224314.GD28812@localhost> <57345FDF.4000804@semihalf.com> Message-ID: <20160512120836.GF28812@localhost> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, May 12, 2016 at 12:50:07PM +0200, Tomasz Nowicki wrote: > On 12.05.2016 00:43, Bjorn Helgaas wrote: > >@@ -70,9 +71,11 @@ struct pci_config_window *pci_ecam_create(struct device *dev, > > cfg->res.flags = IORESOURCE_MEM | IORESOURCE_BUSY; > > cfg->res.name = "PCI ECAM"; > > > >- err = request_resource(&iomem_resource, &cfg->res); > >- if (err) { > >- dev_err(dev, "request ECAM res %pR failed\n", &cfg->res); > >+ conflict = request_resource(&iomem_resource, &cfg->res); > > We need request_resource_conflict here then: > - conflict = request_resource(&iomem_resource, &cfg->res); > + conflict = request_resource_conflict(&iomem_resource, &cfg->res); Whoops, fixed, thanks!