| Message ID | 1446642770-4681-4-git-send-email-gwshan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Gavin Shan <gwshan@linux.vnet.ibm.com> writes: > Each PHB has one instance of "struct pci_controller_ops", which > includes various callbacks called by PCI subsystem. In the definition > of this struct, some callbacks have explicit names for its arguments, > but the left don't have. > > This adds all explicit names of the arguments to the callbacks in > "struct pci_controller_ops" so that the code looks consistent. Thank you very much for doing this - I should have done it the first time I created pci_controller_ops. They all look good, with one nit-pick: > - void (*shutdown)(struct pci_controller *); > + void (*shutdown)(struct pci_controller *hose); I think we're trying to move from hose to phb in new code. Once that is fixed: Reviewed-by: Daniel Axtens <dja@axtens.net> Regards, Daniel > }; > > /* > -- > 2.1.0 > > -- > 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 Fri, Nov 06, 2015 at 09:32:57AM +1100, Daniel Axtens wrote: >Gavin Shan <gwshan@linux.vnet.ibm.com> writes: > >> Each PHB has one instance of "struct pci_controller_ops", which >> includes various callbacks called by PCI subsystem. In the definition >> of this struct, some callbacks have explicit names for its arguments, >> but the left don't have. >> >> This adds all explicit names of the arguments to the callbacks in >> "struct pci_controller_ops" so that the code looks consistent. > >Thank you very much for doing this - I should have done it the first >time I created pci_controller_ops. > >They all look good, with one nit-pick: > >> - void (*shutdown)(struct pci_controller *); >> + void (*shutdown)(struct pci_controller *hose); > >I think we're trying to move from hose to phb in new code. > Nope, We don't have the movement as I explained in previous reply: hose for pci_controller while phb represents pnv_phb on PowerNV platform. >Once that is fixed: > Reviewed-by: Daniel Axtens <dja@axtens.net> > Thanks, Gavin > >> }; >> >> /* >> -- >> 2.1.0 >> >> -- >> 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 -- 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/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 6076116..0f2ff3a 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -21,18 +21,19 @@ struct pci_controller_ops { void (*dma_dev_setup)(struct pci_dev *dev); void (*dma_bus_setup)(struct pci_bus *bus); - int (*probe_mode)(struct pci_bus *); + int (*probe_mode)(struct pci_bus *bus); /* Called when pci_enable_device() is called. Returns true to * allow assignment/enabling of the device. */ - bool (*enable_device_hook)(struct pci_dev *); + bool (*enable_device_hook)(struct pci_dev *dev); - void (*disable_device)(struct pci_dev *); + void (*disable_device)(struct pci_dev *dev); - void (*release_device)(struct pci_dev *); + void (*release_device)(struct pci_dev *dev); /* Called during PCI resource reassignment */ - resource_size_t (*window_alignment)(struct pci_bus *, unsigned long type); + resource_size_t (*window_alignment)(struct pci_bus *bus, + unsigned long type); void (*setup_bridge)(struct pci_bus *bus, unsigned long type); void (*reset_secondary_bus)(struct pci_dev *dev); @@ -46,7 +47,7 @@ struct pci_controller_ops { int (*dma_set_mask)(struct pci_dev *dev, u64 dma_mask); u64 (*dma_get_required_mask)(struct pci_dev *dev); - void (*shutdown)(struct pci_controller *); + void (*shutdown)(struct pci_controller *hose); }; /*
Each PHB has one instance of "struct pci_controller_ops", which includes various callbacks called by PCI subsystem. In the definition of this struct, some callbacks have explicit names for its arguments, but the left don't have. This adds all explicit names of the arguments to the callbacks in "struct pci_controller_ops" so that the code looks consistent. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- arch/powerpc/include/asm/pci-bridge.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)