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

Commit 0178a7a5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

pcmcia: remove DEFINE_PCI_DEVICE_TABLE usage 



It's not needed, just use the "real" structure definition instead.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32182cd3

drivers/pcmcia/bcm63xx_pcmcia.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static void bcm63xx_cb_exit(struct pci_dev *dev) 
	bcm63xx_cb_dev = NULL;

}



static DEFINE_PCI_DEVICE_TABLE(bcm63xx_cb_table) = {

static const struct pci_device_id bcm63xx_cb_table[] = {

	{

		.vendor		= PCI_VENDOR_ID_BROADCOM,

		.device		= BCM6348_CPU_ID,

drivers/pcmcia/i82092.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
MODULE_LICENSE("GPL");



/* PCI core routines */

static DEFINE_PCI_DEVICE_TABLE(i82092aa_pci_ids) = {

static const struct pci_device_id i82092aa_pci_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82092AA_0) },

	{ }

};

drivers/pcmcia/pd6729.c

+1 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static void pd6729_pci_remove(struct pci_dev *dev) 
	kfree(socket);

}



static DEFINE_PCI_DEVICE_TABLE(pd6729_pci_ids) = {

static const struct pci_device_id pd6729_pci_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_6729) },

	{ }

};

drivers/pcmcia/vrc4173_cardu.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static int vrc4173_cardu_setup(char *options) 


__setup("vrc4173_cardu=", vrc4173_cardu_setup);



static DEFINE_PCI_DEVICE_TABLE(vrc4173_cardu_id_table) = {

static const struct pci_device_id vrc4173_cardu_id_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NAPCCARD) },

        {0, }

};

drivers/pcmcia/yenta_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -1352,7 +1352,7 @@ static const struct dev_pm_ops yenta_pm_ops = { 
		.driver_data	= CARDBUS_TYPE_##type,	\

	}



static DEFINE_PCI_DEVICE_TABLE(yenta_table) = {

static const struct pci_device_id yenta_table[] = {

	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1031, TI),



	/*