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

Commit ce3dbe29 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'atm-constify-atm-pci_device_id' 



Arvind Yadav says:

====================
atm: constify atm pci_device_id.

pci_device_id are not supposed to change at runtime. All functions
working with pci_device_id provided by <linux/pci.h> work with
const pci_device_id. So mark the non-const structs as const.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ccdb2d17 97ae5c2a

drivers/atm/ambassador.c

+1 −1
Original line number Diff line number Diff line
@@ -2374,7 +2374,7 @@ MODULE_PARM_DESC(pci_lat, "PCI latency in bus cycles"); 


/********** module entry **********/



static struct pci_device_id amb_pci_tbl[] = {

static const struct pci_device_id amb_pci_tbl[] = {

	{ PCI_VDEVICE(MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR), 0 },

	{ PCI_VDEVICE(MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR_BAD), 0 },

	{ 0, }

drivers/atm/eni.c

+1 −1
Original line number Diff line number Diff line
@@ -2292,7 +2292,7 @@ static int eni_init_one(struct pci_dev *pci_dev, 
}





static struct pci_device_id eni_pci_tbl[] = {

static const struct pci_device_id eni_pci_tbl[] = {

	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_FPGA), 0 /* FPGA */ },

	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_ASIC), 1 /* ASIC */ },

	{ 0, }

drivers/atm/firestream.c

+1 −1
Original line number Diff line number Diff line
@@ -2030,7 +2030,7 @@ static void firestream_remove_one(struct pci_dev *pdev) 
	func_exit ();

}



static struct pci_device_id firestream_pci_tbl[] = {

static const struct pci_device_id firestream_pci_tbl[] = {

	{ PCI_VDEVICE(FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50), FS_IS50},

	{ PCI_VDEVICE(FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS155), FS_IS155},

	{ 0, }

drivers/atm/fore200e.c

+1 −1
Original line number Diff line number Diff line
@@ -2757,7 +2757,7 @@ static void fore200e_pca_remove_one(struct pci_dev *pci_dev) 
}





static struct pci_device_id fore200e_pca_tbl[] = {

static const struct pci_device_id fore200e_pca_tbl[] = {

    { PCI_VENDOR_ID_FORE, PCI_DEVICE_ID_FORE_PCA200E, PCI_ANY_ID, PCI_ANY_ID,

      0, 0, (unsigned long) &fore200e_bus[0] },

    { 0, }

drivers/atm/he.c

+1 −1
Original line number Diff line number Diff line
@@ -2851,7 +2851,7 @@ MODULE_PARM_DESC(irq_coalesce, "use interrupt coalescing (default 1)"); 
module_param(sdh, bool, 0);

MODULE_PARM_DESC(sdh, "use SDH framing (default 0)");



static struct pci_device_id he_pci_tbl[] = {

static const struct pci_device_id he_pci_tbl[] = {

	{ PCI_VDEVICE(FORE, PCI_DEVICE_ID_FORE_HE), 0 },

	{ 0, }

};