Unverified Commit b88f88c2 authored by Alexey Gladkov's avatar Alexey Gladkov Committed by Nathan Chancellor
Browse files

scsi: Always define blogic_pci_tbl structure 



The blogic_pci_tbl structure is used by the MODULE_DEVICE_TABLE macro.
There is no longer a need to protect it with the MODULE condition, since
this no longer causes the compiler to warn about an unused variable.

To avoid warnings when -Wunused-const-variable option is used, mark it
as __maybe_unused for such configuration.

Cc: Khalid Aziz <khalid@gonehiking.org>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Suggested-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAlexey Gladkov <legion@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://patch.msgid.link/fd8e30de07de79a4923ae967eaee5ba2f2fcef00.1758182101.git.legion@kernel.org


Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
parent 39cfd5b1

drivers/scsi/BusLogic.c

+1 −3
Original line number Diff line number Diff line
@@ -3715,7 +3715,6 @@ static void __exit blogic_exit(void) 


__setup("BusLogic=", blogic_setup);



#ifdef MODULE

/*static const struct pci_device_id blogic_pci_tbl[] = {

	{ PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -3725,13 +3724,12 @@ __setup("BusLogic=", blogic_setup); 
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ }

};*/

static const struct pci_device_id blogic_pci_tbl[] = {

static const struct pci_device_id blogic_pci_tbl[] __maybe_unused = {

	{PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER)},

	{PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC)},

	{PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT)},

	{0, },

};

#endif

MODULE_DEVICE_TABLE(pci, blogic_pci_tbl);



module_init(blogic_init);