Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9bacf4b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

ata: sata_mv: Fix PCI device ID table declaration compilation warning 



[ Upstream commit 3137b83a90646917c90951d66489db466b4ae106 ]

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: 7bb3c529 ("sata_mv: Remove PCI dependency")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 81e38e4e

drivers/ata/sata_mv.c

+31 −32
Original line number Diff line number Diff line
@@ -796,37 +796,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,
@@ -4320,6 +4289,36 @@ 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,
@@ -4332,6 +4331,7 @@ static struct pci_driver mv_pci_driver = { 
#endif



};

MODULE_DEVICE_TABLE(pci, mv_pci_tbl);



/* move to PCI layer or libata core? */

static int pci_go_64(struct pci_dev *pdev)
@@ -4534,7 +4534,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);