[PATCHv8 04/10] of: pci: add registry of MSI chips
From: Thierry Reding <hidden>
Date: 2013-08-09 14:18:07
Also in:
linux-pci
On Fri, Aug 09, 2013 at 09:44:27AM -0400, Jason Cooper wrote:
quoted hunk ↗ jump to hunk
On Fri, Aug 09, 2013 at 03:49:06PM +1000, Benjamin Herrenschmidt wrote:quoted
On Fri, 2013-08-09 at 00:17 +0200, Thomas Petazzoni wrote:quoted
+#if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI) +int of_pci_msi_chip_add(struct msi_chip *chip); +void of_pci_msi_chip_remove(struct msi_chip *chip); +struct msi_chip *of_pci_find_msi_chip_by_node(struct device_node *of_node); +#else +static inline int of_pci_msi_chip_add(struct msi_chip *chip) { return -EINVAL; } +static inline void of_pci_msi_chip_remove(struct msi_chip *chip) { }Missing a ; at the end of the above line... breaks the build of CONFIG_PCI_MSI is not set.quoted
+static inline struct msi_chip * +of_pci_find_msi_chip_by_node(struct device_node *of_node) { return NULL }; +#endif + #endifReproduced, fixed and builds clean !CONFIG_OF and !CONFIG_PCI_MSI with: ---------------->8----------------diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index 29631eb..9f69507 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h@@ -19,10 +19,11 @@ int of_pci_msi_chip_add(struct msi_chip *chip); void of_pci_msi_chip_remove(struct msi_chip *chip); struct msi_chip *of_pci_find_msi_chip_by_node(struct device_node *of_node); #else -static inline int of_pci_msi_chip_add(struct msi_chip *chip) { return -EINVAL; } -static inline void of_pci_msi_chip_remove(struct msi_chip *chip) { } +static inline int +of_pci_msi_chip_add(struct msi_chip *chip) { return -EINVAL; }; +static inline void of_pci_msi_chip_remove(struct msi_chip *chip) { }; static inline struct msi_chip * -of_pci_find_msi_chip_by_node(struct device_node *of_node) { return NULL }; +of_pci_find_msi_chip_by_node(struct device_node *of_node) { return NULL; }; #endif #endif
So why do we need a semi-colon after a closing brace? I can understand how the missing semi-colon after NULL would cause the compiler to flag an error, but all the other changes look unnecessary to me. Thierry -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130809/78740b22/attachment.sig>