Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaddb572 authored by Rob Herring's avatar Rob Herring
Browse files

of/irq: move of_msi_map_rid declaration to the correct ifdef section 



In checking fixes for of_irq_find_parent declaration location, I found
that of_msi_map_rid is also wrong. of_msi_map_rid is not implemented for
Sparc, so it should not be in the Sparc specific section of the header.
Move it to just depend on OF_IRQ.

Cc: Frank Rowand <frowand.list@gmail.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 4c3141e0

include/linux/of_irq.h

+6 −7
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern struct irq_domain *of_msi_get_domain(struct device *dev, 
extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev,

						       u32 rid);

extern void of_msi_configure(struct device *dev, struct device_node *np);

u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);

#else

static inline int of_irq_count(struct device_node *dev)

{
@@ -90,6 +91,11 @@ static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev 
static inline void of_msi_configure(struct device *dev, struct device_node *np)

{

}

static inline u32 of_msi_map_rid(struct device *dev,

				 struct device_node *msi_np, u32 rid_in)

{

	return rid_in;

}

#endif



#if defined(CONFIG_OF_IRQ) || defined(CONFIG_SPARC)
@@ -99,7 +105,6 @@ static inline void of_msi_configure(struct device *dev, struct device_node *np) 
 * so declare it here regardless of the CONFIG_OF_IRQ setting.

 */

extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);

u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);



#else /* !CONFIG_OF && !CONFIG_SPARC */

static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
@@ -107,12 +112,6 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, 
{

	return 0;

}



static inline u32 of_msi_map_rid(struct device *dev,

				 struct device_node *msi_np, u32 rid_in)

{

	return rid_in;

}

#endif /* !CONFIG_OF */



#endif /* __OF_IRQ_H */