| Message ID | 20150604214929.2399.85988.stgit@bhelgaas-glaptop2.roam.corp.google.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On 06/04/2015 11:49 PM, Bjorn Helgaas wrote: > The following declarations were copied from powerpc but are unused on > microblaze: > > struct pci_controller *init_phb_dynamic(struct device_node *dn) > int remove_phb_dynamic(struct pci_controller *phb) > struct pci_dev *of_create_pci_dev(struct device_node *node, ...) > void of_scan_pci_bridge(struct device_node *node, ...) > void of_scan_bus(struct device_node *node, struct pci_bus *bus) > void of_rescan_bus(struct device_node *node, struct pci_bus *bus) > > Remove them. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > CC: Michal Simek <monstr@monstr.eu> > --- > arch/microblaze/include/asm/pci.h | 12 ------------ > 1 file changed, 12 deletions(-) Reviewed-by: Michal Simek <michal.simek@xilinx.com> Bjorn: Do you want me to take this via Microblaze tree? Thanks, Michal
On Fri, Jun 5, 2015 at 2:07 AM, Michal Simek <monstr@monstr.eu> wrote: > On 06/04/2015 11:49 PM, Bjorn Helgaas wrote: >> The following declarations were copied from powerpc but are unused on >> microblaze: >> >> struct pci_controller *init_phb_dynamic(struct device_node *dn) >> int remove_phb_dynamic(struct pci_controller *phb) >> struct pci_dev *of_create_pci_dev(struct device_node *node, ...) >> void of_scan_pci_bridge(struct device_node *node, ...) >> void of_scan_bus(struct device_node *node, struct pci_bus *bus) >> void of_rescan_bus(struct device_node *node, struct pci_bus *bus) >> >> Remove them. >> >> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> >> CC: Michal Simek <monstr@monstr.eu> >> --- >> arch/microblaze/include/asm/pci.h | 12 ------------ >> 1 file changed, 12 deletions(-) > > Reviewed-by: Michal Simek <michal.simek@xilinx.com> > > Bjorn: Do you want me to take this via Microblaze tree? Sure, it'd be great if you take all the Microblaze-specific patches. There aren't any dependencies on them, so there shouldn't be any problem. I do have a Microblaze hunk in "PCI: Remove unused pci_dma_burst_advice()" and if you agree, I'll merge that one through my tree since the change for each arch is essentially identical. Bjorn -- 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
On 06/05/2015 05:11 PM, Bjorn Helgaas wrote: > On Fri, Jun 5, 2015 at 2:07 AM, Michal Simek <monstr@monstr.eu> wrote: >> On 06/04/2015 11:49 PM, Bjorn Helgaas wrote: >>> The following declarations were copied from powerpc but are unused on >>> microblaze: >>> >>> struct pci_controller *init_phb_dynamic(struct device_node *dn) >>> int remove_phb_dynamic(struct pci_controller *phb) >>> struct pci_dev *of_create_pci_dev(struct device_node *node, ...) >>> void of_scan_pci_bridge(struct device_node *node, ...) >>> void of_scan_bus(struct device_node *node, struct pci_bus *bus) >>> void of_rescan_bus(struct device_node *node, struct pci_bus *bus) >>> >>> Remove them. >>> >>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> >>> CC: Michal Simek <monstr@monstr.eu> >>> --- >>> arch/microblaze/include/asm/pci.h | 12 ------------ >>> 1 file changed, 12 deletions(-) >> >> Reviewed-by: Michal Simek <michal.simek@xilinx.com> >> >> Bjorn: Do you want me to take this via Microblaze tree? > > Sure, it'd be great if you take all the Microblaze-specific patches. > There aren't any dependencies on them, so there shouldn't be any > problem. Ok. Added these 3 patches to microblaze next branch - it will be in linux-next tmr. > > I do have a Microblaze hunk in "PCI: Remove unused > pci_dma_burst_advice()" and if you agree, I'll merge that one through > my tree since the change for each arch is essentially identical. No problem at all. Feel free to add there my acked-by line for microblaze. Thanks, Michal
On Mon, Jun 08, 2015 at 10:06:30AM +0200, Michal Simek wrote: > On 06/05/2015 05:11 PM, Bjorn Helgaas wrote: > > On Fri, Jun 5, 2015 at 2:07 AM, Michal Simek <monstr@monstr.eu> wrote: > >> On 06/04/2015 11:49 PM, Bjorn Helgaas wrote: > >>> The following declarations were copied from powerpc but are unused on > >>> microblaze: > >>> > >>> struct pci_controller *init_phb_dynamic(struct device_node *dn) > >>> int remove_phb_dynamic(struct pci_controller *phb) > >>> struct pci_dev *of_create_pci_dev(struct device_node *node, ...) > >>> void of_scan_pci_bridge(struct device_node *node, ...) > >>> void of_scan_bus(struct device_node *node, struct pci_bus *bus) > >>> void of_rescan_bus(struct device_node *node, struct pci_bus *bus) > >>> > >>> Remove them. > >>> > >>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > >>> CC: Michal Simek <monstr@monstr.eu> > >>> --- > >>> arch/microblaze/include/asm/pci.h | 12 ------------ > >>> 1 file changed, 12 deletions(-) > >> > >> Reviewed-by: Michal Simek <michal.simek@xilinx.com> > >> > >> Bjorn: Do you want me to take this via Microblaze tree? > > > > Sure, it'd be great if you take all the Microblaze-specific patches. > > There aren't any dependencies on them, so there shouldn't be any > > problem. > > Ok. Added these 3 patches to microblaze next branch - it will be in > linux-next tmr. Great, thanks! I dropped them from my branch. > > I do have a Microblaze hunk in "PCI: Remove unused > > pci_dma_burst_advice()" and if you agree, I'll merge that one through > > my tree since the change for each arch is essentially identical. > > No problem at all. Feel free to add there my acked-by line for microblaze. Done, thanks again! Bjorn -- 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
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 468aca8..b6b5b3c 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -102,18 +102,6 @@ extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); extern void pcibios_resource_survey(void); -extern struct pci_controller *init_phb_dynamic(struct device_node *dn); -extern int remove_phb_dynamic(struct pci_controller *phb); - -extern struct pci_dev *of_create_pci_dev(struct device_node *node, - struct pci_bus *bus, int devfn); - -extern void of_scan_pci_bridge(struct device_node *node, - struct pci_dev *dev); - -extern void of_scan_bus(struct device_node *node, struct pci_bus *bus); -extern void of_rescan_bus(struct device_node *node, struct pci_bus *bus); - extern int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap);
The following declarations were copied from powerpc but are unused on microblaze: struct pci_controller *init_phb_dynamic(struct device_node *dn) int remove_phb_dynamic(struct pci_controller *phb) struct pci_dev *of_create_pci_dev(struct device_node *node, ...) void of_scan_pci_bridge(struct device_node *node, ...) void of_scan_bus(struct device_node *node, struct pci_bus *bus) void of_rescan_bus(struct device_node *node, struct pci_bus *bus) Remove them. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Michal Simek <monstr@monstr.eu> --- arch/microblaze/include/asm/pci.h | 12 ------------ 1 file changed, 12 deletions(-) -- 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