]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
misc: mrvl-cn10k-dpi: add PCI_IOV dependency
authorArnd Bergmann <arnd@arndb.de>
Fri, 19 Jul 2024 10:38:23 +0000 (12:38 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Jul 2024 11:47:27 +0000 (13:47 +0200)
I found one more missing dependency in the new driver: when building
without CONFIG_PCI_IOV, pci_sriov_configure_simple() cannot be
called directly:

drivers/misc/mrvl_cn10k_dpi.c: In function 'dpi_remove':
include/linux/stddef.h:9:14: error: called object is not a function or function pointer
    9 | #define NULL ((void *)0)
      |              ^
include/linux/pci.h:2416:41: note: in expansion of macro 'NULL'
 2416 | #define pci_sriov_configure_simple      NULL
      |                                         ^~~~
drivers/misc/mrvl_cn10k_dpi.c:652:9: note: in expansion of macro 'pci_sriov_configure_simple'
  652 |         pci_sriov_configure_simple(pdev, 0);

Add this to the Kconfig file as well.

Fixes: 5f67eef6dff3 ("misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Vamsi Attunuru <vattunuru@marvell.com>
Link: https://lore.kernel.org/r/20240719103858.1292094-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/Kconfig

index 41c3d2821a78505ce74eca2012700368c7381305..41c54051347ab7fc3bb8691595b35bdb67a7d40e 100644 (file)
@@ -587,7 +587,7 @@ config NSM
 
 config MARVELL_CN10K_DPI
        tristate "Octeon CN10K DPI driver"
-       depends on PCI
+       depends on PCI && PCI_IOV
        depends on ARCH_THUNDER || (COMPILE_TEST && 64BIT)
        help
          Enables Octeon CN10K DMA packet interface (DPI) driver which