Re: [PATCH v3] of: fix build failure

From: Geert Uytterhoeven
Date: Mon Dec 07 2015 - 13:12:35 EST


On Mon, Dec 7, 2015 at 5:30 PM, Sudip Mukherjee
<sudipm.mukherjee@xxxxxxxxx> wrote:
>> > --- a/include/linux/of_address.h
>> > +++ b/include/linux/of_address.h
>> > @@ -112,8 +112,6 @@ static inline bool of_dma_is_coherent(struct device_node *np)
>> > extern int of_address_to_resource(struct device_node *dev, int index,
>> > struct resource *r);
>> > void __iomem *of_iomap(struct device_node *node, int index);
>> > -void __iomem *of_io_request_and_map(struct device_node *device,
>> > - int index, const char *name);
>>
>> Upon closer look, both of_address_to_resource() and of_iomap() are
>> provided by drivers/of/address.c, so they should also be protected by
>> #ifdef CONFIG_OF_ADDRESS instead of CONFIG_OF.
>> Then the whole #ifdef CONFIG_OF section becomes empty.
>>
>> > #else
> <snip>
>> >
>> > #if defined(CONFIG_OF_ADDRESS) && defined(CONFIG_PCI)
>> > extern const __be32 *of_get_pci_address(struct device_node *dev, int bar_no,
>>
>> Hence can you please move all of them to the existing
>> #ifdef CONFIG_OF_ADDRESS section, and move the #include <linux/io.h>
>> to the top?
>
> oops, no. I think you have missed seeing few more places.
> of_address_to_resource() of_iomap() are both defined in
> arch/sparc/kernel/of_device_common.c
> So if it is moved under #ifdef CONFIG_OF_ADDRESS then we again
> get a build failure for duplicate definition of them.

Oops, you're right.

Sorry, I never noticed before sparc provides its own definitions.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/