On 4/3/24 17:06, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> Building with W=1 shows a warning for an unused variable when CONFIG_PCI
> is diabled:
>
> drivers/ata/sata_mv.c:790:35: error: unused variable 'mv_pci_tbl' [-Werror,-Wunused-const-variable]
> static const struct pci_device_id mv_pci_tbl[] = {
>
> Move the table into the same block that containsn the pci_driver
> definition.
>
> Fixes: 7bb3c5290ca0 ("sata_mv: Remove PCI dependency")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
The patch title is also not describing what the patch does.
Are you OK with changing that to:
ata: sata_mv: Fix PCI device ID table declaration warning
?
> ---
> drivers/ata/sata_mv.c | 64 +++++++++++++++++++++----------------------
> 1 file changed, 32 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index e82786c63fbd..697063890f5d 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -787,37 +787,6 @@ static const struct ata_port_info mv_port_info[] = {
> },
> };
>
> -static const struct pci_device_id mv_pci_tbl[] = {
> - { PCI_VDEVICE(MARVELL, 0x5040), chip_504x },
> - { PCI_VDEVICE(MARVELL, 0x5041), chip_504x },
> - { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 },
> - { PCI_VDEVICE(MARVELL, 0x5081), chip_508x },
> - /* RocketRAID 1720/174x have different identifiers */
> - { PCI_VDEVICE(TTI, 0x1720), chip_6042 },
> - { PCI_VDEVICE(TTI, 0x1740), chip_6042 },
> - { PCI_VDEVICE(TTI, 0x1742), chip_6042 },
> -
> - { PCI_VDEVICE(MARVELL, 0x6040), chip_604x },
> - { PCI_VDEVICE(MARVELL, 0x6041), chip_604x },
> - { PCI_VDEVICE(MARVELL, 0x6042), chip_6042 },
> - { PCI_VDEVICE(MARVELL, 0x6080), chip_608x },
> - { PCI_VDEVICE(MARVELL, 0x6081), chip_608x },
> -
> - { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x },
> -
> - /* Adaptec 1430SA */
> - { PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 },
> -
> - /* Marvell 7042 support */
> - { PCI_VDEVICE(MARVELL, 0x7042), chip_7042 },
> -
> - /* Highpoint RocketRAID PCIe series */
> - { PCI_VDEVICE(TTI, 0x2300), chip_7042 },
> - { PCI_VDEVICE(TTI, 0x2310), chip_7042 },
> -
> - { } /* terminate list */
> -};
> -
> static const struct mv_hw_ops mv5xxx_ops = {
> .phy_errata = mv5_phy_errata,
> .enable_leds = mv5_enable_leds,
> @@ -4303,6 +4272,37 @@ static int mv_pci_init_one(struct pci_dev *pdev,
> static int mv_pci_device_resume(struct pci_dev *pdev);
> #endif
>
> +static const struct pci_device_id mv_pci_tbl[] = {
> + { PCI_VDEVICE(MARVELL, 0x5040), chip_504x },
> + { PCI_VDEVICE(MARVELL, 0x5041), chip_504x },
> + { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 },
> + { PCI_VDEVICE(MARVELL, 0x5081), chip_508x },
> + /* RocketRAID 1720/174x have different identifiers */
> + { PCI_VDEVICE(TTI, 0x1720), chip_6042 },
> + { PCI_VDEVICE(TTI, 0x1740), chip_6042 },
> + { PCI_VDEVICE(TTI, 0x1742), chip_6042 },
> +
> + { PCI_VDEVICE(MARVELL, 0x6040), chip_604x },
> + { PCI_VDEVICE(MARVELL, 0x6041), chip_604x },
> + { PCI_VDEVICE(MARVELL, 0x6042), chip_6042 },
> + { PCI_VDEVICE(MARVELL, 0x6080), chip_608x },
> + { PCI_VDEVICE(MARVELL, 0x6081), chip_608x },
> +
> + { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x },
> +
> + /* Adaptec 1430SA */
> + { PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 },
> +
> + /* Marvell 7042 support */
> + { PCI_VDEVICE(MARVELL, 0x7042), chip_7042 },
> +
> + /* Highpoint RocketRAID PCIe series */
> + { PCI_VDEVICE(TTI, 0x2300), chip_7042 },
> + { PCI_VDEVICE(TTI, 0x2310), chip_7042 },
> +
> + { } /* terminate list */
> +};
> +
>
> static struct pci_driver mv_pci_driver = {
> .name = DRV_NAME,
> @@ -4315,6 +4315,7 @@ static struct pci_driver mv_pci_driver = {
> #endif
>
> };
> +MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
>
> /**
> * mv_print_info - Dump key info to kernel log for perusal.
> @@ -4487,7 +4488,6 @@ static void __exit mv_exit(void)
> MODULE_AUTHOR("Brett Russ");
> MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");
> MODULE_LICENSE("GPL v2");
> -MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
> MODULE_VERSION(DRV_VERSION);
> MODULE_ALIAS("platform:" DRV_NAME);
>
--
Damien Le Moal
Western Digital Research
