]> git.baikalelectronics.ru Git - uboot.git/commit
axi: fix definition of axi_sandbox_get_emul()
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Wed, 10 May 2023 09:59:20 +0000 (11:59 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 1 Jun 2023 16:32:03 +0000 (12:32 -0400)
commitb29006cf6a1c31a787efb3bac80e6f2bd49889d2
tree6c43f322e83e4910cc861db65e20fd5d20d92360
parent04a686cca7662ab51005f7d6eaf5273b976a75f1
axi: fix definition of axi_sandbox_get_emul()

Compiling with gcc 13 results in an error:

    drivers/axi/axi-emul-uclass.c:16:5: warning: conflicting types for
    ‘axi_sandbox_get_emul’ due to enum/integer mismatch; have
    ‘int(struct udevice *, ulong,  enum axi_size_t,  struct udevice **)’
    {aka ‘int(struct udevice *, long unsigned int,  enum axi_size_t,
    struct udevice **)’} [-Wenum-int-mismatch]
       16 | int axi_sandbox_get_emul(struct udevice *bus, ulong address,
          |     ^~~~~~~~~~~~~~~~~~~~
    In file included from drivers/axi/axi-emul-uclass.c:14:
    ./arch/sandbox/include/asm/axi.h:48:5: note: previous declaration of
    ‘axi_sandbox_get_emul’ with type ‘int(struct udevice *, ulong,  uint,
    struct udevice **)’ {aka ‘int(struct udevice *, long unsigned int,
    unsigned int,  struct udevice **)’}
       48 | int axi_sandbox_get_emul(struct udevice *bus, ulong address, uint length,
          |     ^~~~~~~~~~~~~~~~~~~~

Adjust the header definition to match the implementation.
Define the size parameter as constant.

Fixes: 66d87eae267d ("axi: Add AXI sandbox driver and simple emulator")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
arch/sandbox/include/asm/axi.h
drivers/axi/axi-emul-uclass.c