mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
ata: sata_mv: Fix PCI device ID table declaration compilation warning
[ Upstream commit3137b83a90
] 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:7bb3c5290c
("sata_mv: Remove PCI dependency") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
4b31a22609
commit
cbd080c308
1 changed files with 31 additions and 32 deletions
|
@ -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 = {
|
static const struct mv_hw_ops mv5xxx_ops = {
|
||||||
.phy_errata = mv5_phy_errata,
|
.phy_errata = mv5_phy_errata,
|
||||||
.enable_leds = mv5_enable_leds,
|
.enable_leds = mv5_enable_leds,
|
||||||
|
@ -4300,6 +4269,36 @@ static int mv_pci_init_one(struct pci_dev *pdev,
|
||||||
static int mv_pci_device_resume(struct pci_dev *pdev);
|
static int mv_pci_device_resume(struct pci_dev *pdev);
|
||||||
#endif
|
#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 = {
|
static struct pci_driver mv_pci_driver = {
|
||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
|
@ -4312,6 +4311,7 @@ static struct pci_driver mv_pci_driver = {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
};
|
};
|
||||||
|
MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* mv_print_info - Dump key info to kernel log for perusal.
|
* mv_print_info - Dump key info to kernel log for perusal.
|
||||||
|
@ -4484,7 +4484,6 @@ static void __exit mv_exit(void)
|
||||||
MODULE_AUTHOR("Brett Russ");
|
MODULE_AUTHOR("Brett Russ");
|
||||||
MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");
|
MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");
|
||||||
MODULE_LICENSE("GPL v2");
|
MODULE_LICENSE("GPL v2");
|
||||||
MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
|
|
||||||
MODULE_VERSION(DRV_VERSION);
|
MODULE_VERSION(DRV_VERSION);
|
||||||
MODULE_ALIAS("platform:" DRV_NAME);
|
MODULE_ALIAS("platform:" DRV_NAME);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue