diff mbox

[PATCHv8,04/10] of: pci: add registry of MSI chips

Message ID 20130809134427.GC25111@titan.lakedaemon.net
State Not Applicable
Headers show

Commit Message

Jason Cooper Aug. 9, 2013, 1:44 p.m. UTC 
On Fri, Aug 09, 2013 at 03:49:06PM +1000, Benjamin Herrenschmidt wrote:
> On Fri, 2013-08-09 at 00:17 +0200, Thomas Petazzoni wrote:
> > 
> > +#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.
> 
> > +static inline struct msi_chip *
> > +of_pci_find_msi_chip_by_node(struct device_node *of_node) { return
> > NULL };
> > +#endif
> > +
> >  #endif

Reproduced, fixed and builds clean !CONFIG_OF and !CONFIG_PCI_MSI with:

---------------->8----------------
--
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

Comments

Thierry Reding Aug. 9, 2013, 2:18 p.m. UTC | #1 
On Fri, Aug 09, 2013 at 09:44:27AM -0400, Jason Cooper wrote:
> On Fri, Aug 09, 2013 at 03:49:06PM +1000, Benjamin Herrenschmidt wrote:
> > On Fri, 2013-08-09 at 00:17 +0200, Thomas Petazzoni wrote:
> > > 
> > > +#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.
> > 
> > > +static inline struct msi_chip *
> > > +of_pci_find_msi_chip_by_node(struct device_node *of_node) { return
> > > NULL };
> > > +#endif
> > > +
> > >  #endif
> 
> Reproduced, 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
Jason Cooper Aug. 9, 2013, 2:27 p.m. UTC | #2 
On Fri, Aug 09, 2013 at 04:18:07PM +0200, Thierry Reding wrote:
> On Fri, Aug 09, 2013 at 09:44:27AM -0400, Jason Cooper wrote:
> > On Fri, Aug 09, 2013 at 03:49:06PM +1000, Benjamin Herrenschmidt wrote:
> > > On Fri, 2013-08-09 at 00:17 +0200, Thomas Petazzoni wrote:
> > > > 
> > > > +#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.
> > > 
> > > > +static inline struct msi_chip *
> > > > +of_pci_find_msi_chip_by_node(struct device_node *of_node) { return
> > > > NULL };
> > > > +#endif
> > > > +
> > > >  #endif
> > 
> > Reproduced, 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.

You're correct, I sent this a little too hastily.  I thought Ben knew
something I didn't (see above), but the error was only where you
indicated.  I'm revising my fix to just append the semi-colon after the
NULL.

thx,

Jason.
--
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
Benjamin Herrenschmidt Aug. 9, 2013, 9:54 p.m. UTC | #3 
On Fri, 2013-08-09 at 10:27 -0400, Jason Cooper wrote:
> 
> You're correct, I sent this a little too hastily.  I thought Ben knew
> something I didn't (see above), but the error was only where you
> indicated.  I'm revising my fix to just append the semi-colon after
> the
> NULL.

I messed up in my reply, I was talking about the one after the NULL.

Cheers,
Ben.


--
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 mbox

Patch

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