Re: [PATCH] USB: core: fix missing include <linux/usb/of.h>

From: Peter Chen
Date: Thu Jun 16 2016 - 21:37:35 EST


On Thu, Jun 16, 2016 at 02:02:37PM +0100, Ben Dooks wrote:
> On 14/06/16 12:08, Arnd Bergmann wrote:
> > On Wednesday, June 8, 2016 3:04:27 AM CEST kbuild test robot wrote:
> >>>> drivers/usb/core/of.c:32:21: error: redefinition of 'usb_of_get_child_node'
> >> struct device_node *usb_of_get_child_node(struct device_node *parent,
> >> ^~~~~~~~~~~~~~~~~~~~~
> >> In file included from drivers/usb/core/of.c:21:0:
> >> include/linux/usb/of.h:36:35: note: previous definition of 'usb_of_get_child_node' was here
> >> static inline struct device_node *usb_of_get_child_node
> >> ^~~~~~~~~~~~~~~~~~~~~
> >>
> >> vim +/usb_of_get_child_node +32 drivers/usb/core/of.c
> >>
> >> 69bec725 Peter Chen 2016-02-19 26 * @portnum: the port number which device is connecting
> >> 69bec725 Peter Chen 2016-02-19 27 *
> >> 69bec725 Peter Chen 2016-02-19 28 * Find the node from device tree according to its port number.
> >> 69bec725 Peter Chen 2016-02-19 29 *
> >> 69bec725 Peter Chen 2016-02-19 30 * Return: On success, a pointer to the device node, %NULL on failure.
> >> 69bec725 Peter Chen 2016-02-19 31 */
> >> 69bec725 Peter Chen 2016-02-19 @32 struct device_node *usb_of_get_child_node(struct device_node *parent,
> >> 69bec725 Peter Chen 2016-02-19 33 int portnum)
> >> 69bec725 Peter Chen 2016-02-19 34 {
> >> 69bec725 Peter Chen 2016-02-19 35 struct device_node *node;
> >>
> >>
> >
> > I think what we want here is to make the compilation of of.o conditional on
> > CONFIG_OF, so we get only one of the two definitions.
>
> Ah, so make the of.o conditional, and also apply my patch for when
> it is compiled.
>
> Should I submit one for that, or is someone else on the case?
>

Yes, Ben. I have already done it.

http://www.spinics.net/lists/linux-usb/msg142676.html

--

Best Regards,
Peter Chen