Re: [PATCH 73/81] usb: Remove <common.h> and add needed includes

[Mattijs Korpershoek <mkorpershoek@baylibre.com>]

Hi Tom,

On jeu., mai 02, 2024 at 08:51, Tom Rini <trini@konsulko.com> wrote:

> On Thu, May 02, 2024 at 09:40:52AM +0200, Mattijs Korpershoek wrote:
>> Hi Tom,
>> 
>> Thank you for the patch
>> 
>> On mer., mai 01, 2024 at 19:31, Tom Rini <trini@konsulko.com> wrote:
>> 
>> > Remove <common.h> from this driver directory and when needed
>> > add missing include files directly.
>> >
>> > Signed-off-by: Tom Rini <trini@konsulko.com>
>> 
>> [...]
>> 
>> > diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
>> > index fedcf7869295..38c5928faed5 100644
>> > --- a/drivers/usb/host/xhci-rcar.c
>> > +++ b/drivers/usb/host/xhci-rcar.c
>> > @@ -5,7 +5,6 @@
>> >   * Renesas RCar USB HOST xHCI Controller
>> >   */
>> >  
>> > -#include <common.h>
>> >  #include <clk.h>
>> >  #include <dm.h>
>> >  #include <fdtdec.h>
>> > diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
>> > index 910c5f3352b8..1360a5940fa0 100644
>> > --- a/drivers/usb/host/xhci-ring.c
>> > +++ b/drivers/usb/host/xhci-ring.c
>> > @@ -13,7 +13,6 @@
>> >   *	    Vikas Sajjan <vikas.sajjan@samsung.com>
>> >   */
>> >  
>> > -#include <common.h>
>> 
>> This generates the following build warning with
>> khadas-vim3_android_defconfig:
>> 
>> drivers/usb/host/xhci-ring.c: In function 'xhci_wait_for_event':
>> drivers/usb/host/xhci-ring.c:464:28: warning: implicit declaration of function 'get_timer'; did you mean 'get_mem'? [-Wimplicit-function-declaration]
>>   464 |         unsigned long ts = get_timer(0);
>>       |                            ^~~~~~~~~
>>       |                            get_mem
>> 
>> Adding: "#include <time.h>" fixes the warning.
>> 
>> With the above fix included:
>> 
>> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
>
> Did you have the full series applied? I don't see the warning here (nor
> in CI) and I suspect that:
> https://patchwork.ozlabs.org/project/uboot/patch/20240502013138.2383421-9-trini@konsulko.com/
> is what resolves this warning.

No, I did not apply the full series. I had some conflicts on both:
- master: ff0de1f0557e ("Merge patch series "Update PHYTEC SOM Detection"")
- next: bc39e0677816 ("Subtree merge tag 'v6.8-dts' of devicetree-rebasing repo [1] into dts/upstream")

The above patch resolves the warning, indeed!

Thanks


>
> -- 
> Tom