Re: [geert-renesas-drivers:master 32/48] drivers/dma/dw-edma/dw-edma-core.c:231:13: error: redefinition of 'dw_edma_device_caps'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Apr 25, 2023 at 8:10 PM kernel test robot <lkp@xxxxxxxxx> wrote:
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git master
> head:   109f3e0b7f96d5fdf923b8002a68961774c25a6e
> commit: 96f65c7bbf0f2e3f2913180b739a926d3b3ddc9c [32/48] Merge remote-tracking branch 'pci/next' into renesas-drivers
> config: ia64-allmodconfig (https://download.01.org/0day-ci/archive/20230426/202304260234.QTHOuoZG-lkp@xxxxxxxxx/config)
> compiler: ia64-linux-gcc (GCC) 12.1.0
> reproduce (this is a W=1 build):
>         wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
>         chmod +x ~/bin/make.cross
>         # https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git/commit/?id=96f65c7bbf0f2e3f2913180b739a926d3b3ddc9c
>         git remote add geert-renesas-drivers https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
>         git fetch --no-tags geert-renesas-drivers master
>         git checkout 96f65c7bbf0f2e3f2913180b739a926d3b3ddc9c
>         # save the config file
>         mkdir build_dir && cp config build_dir/.config
>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=ia64 olddefconfig
>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=ia64 SHELL=/bin/bash drivers/dma/dw-edma/
>
> If you fix the issue, kindly add following tag where applicable
> | Reported-by: kernel test robot <lkp@xxxxxxxxx>
> | Link: https://lore.kernel.org/oe-kbuild-all/202304260234.QTHOuoZG-lkp@xxxxxxxxx/
>
> All errors (new ones prefixed by >>):
>
> >> drivers/dma/dw-edma/dw-edma-core.c:231:13: error: redefinition of 'dw_edma_device_caps'
>      231 | static void dw_edma_device_caps(struct dma_chan *dchan,
>          |             ^~~~~~~~~~~~~~~~~~~
>    drivers/dma/dw-edma/dw-edma-core.c:213:13: note: previous definition of 'dw_edma_device_caps' with type 'void(struct dma_chan *, struct dma_slave_caps *)'
>      213 | static void dw_edma_device_caps(struct dma_chan *dchan,
>          |             ^~~~~~~~~~~~~~~~~~~
>    drivers/dma/dw-edma/dw-edma-core.c:213:13: warning: 'dw_edma_device_caps' defined but not used [-Wunused-function]

Thanks, looks like a borked merge conflict on my side.

> vim +/dw_edma_device_caps +231 drivers/dma/dw-edma/dw-edma-core.c
>
> 3883d64449ffe8 Serge Semin 2023-01-13  230
> 6f94141d8662ff Serge Semin 2023-01-13 @231  static void dw_edma_device_caps(struct dma_chan *dchan,
> 6f94141d8662ff Serge Semin 2023-01-13  232                              struct dma_slave_caps *caps)
> 6f94141d8662ff Serge Semin 2023-01-13  233  {
> 6f94141d8662ff Serge Semin 2023-01-13  234      struct dw_edma_chan *chan = dchan2dw_edma_chan(dchan);
> 6f94141d8662ff Serge Semin 2023-01-13  235
> 6f94141d8662ff Serge Semin 2023-01-13  236      if (chan->dw->chip->flags & DW_EDMA_CHIP_LOCAL) {
> 6f94141d8662ff Serge Semin 2023-01-13  237              if (chan->dir == EDMA_DIR_READ)
> 6f94141d8662ff Serge Semin 2023-01-13  238                      caps->directions = BIT(DMA_DEV_TO_MEM);
> 6f94141d8662ff Serge Semin 2023-01-13  239              else
> 6f94141d8662ff Serge Semin 2023-01-13  240                      caps->directions = BIT(DMA_MEM_TO_DEV);
> 6f94141d8662ff Serge Semin 2023-01-13  241      } else {
> 6f94141d8662ff Serge Semin 2023-01-13  242              if (chan->dir == EDMA_DIR_WRITE)
> 6f94141d8662ff Serge Semin 2023-01-13  243                      caps->directions = BIT(DMA_DEV_TO_MEM);
> 6f94141d8662ff Serge Semin 2023-01-13  244              else
> 6f94141d8662ff Serge Semin 2023-01-13  245                      caps->directions = BIT(DMA_MEM_TO_DEV);
> 6f94141d8662ff Serge Semin 2023-01-13  246      }
> 6f94141d8662ff Serge Semin 2023-01-13  247  }
> 6f94141d8662ff Serge Semin 2023-01-13  248

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



[Index of Archives]     [Linux Samsung SOC]     [Linux Wireless]     [Linux Kernel]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]

  Powered by Linux