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

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

Merge branch 'isdn-const-pci_device_ids' 



Arvind Yadav says:

====================
Constify isdn pci_device_id's.

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 32984565 65f96417

drivers/isdn/hardware/avm/c4.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static char *revision = "$Revision: 1.1.2.2 $"; 


static bool suppress_pollack;



static struct pci_device_id c4_pci_tbl[] = {

static const struct pci_device_id c4_pci_tbl[] = {

	{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C4, 0, 0, (unsigned long)4 },

	{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C2, 0, 0, (unsigned long)2 },

	{ }			/* Terminating entry */

drivers/isdn/hardware/eicon/divasmain.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ typedef struct _diva_os_thread_dpc { 
/*

  This table should be sorted by PCI device ID

*/

static struct pci_device_id divas_pci_tbl[] = {

static const struct pci_device_id divas_pci_tbl[] = {

	/* Diva Server BRI-2M PCI 0xE010 */

	{ PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRA),

	  CARDTYPE_MAESTRA_PCI },

drivers/isdn/hardware/mISDN/avmfritz.c

+1 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ fritz_remove_pci(struct pci_dev *pdev) 
			pr_info("%s: drvdata already removed\n", __func__);

}



static struct pci_device_id fcpci_ids[] = {

static const struct pci_device_id fcpci_ids[] = {

	{ PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID,

	  0, 0, (unsigned long) "Fritz!Card PCI"},

	{ PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1_V2, PCI_ANY_ID, PCI_ANY_ID,

drivers/isdn/hardware/mISDN/hfcmulti.c

+1 −1
Original line number Diff line number Diff line
@@ -5348,7 +5348,7 @@ static const struct hm_map hfcm_map[] = { 


#undef H

#define H(x)	((unsigned long)&hfcm_map[x])

static struct pci_device_id hfmultipci_ids[] = {

static const struct pci_device_id hfmultipci_ids[] = {



	/* Cards with HFC-4S Chip */

	{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD,

drivers/isdn/hardware/mISDN/hfcpci.c

+1 −1
Original line number Diff line number Diff line
@@ -2161,7 +2161,7 @@ static const struct _hfc_map hfc_map[] = 
	{},

};



static struct pci_device_id hfc_ids[] =

static const struct pci_device_id hfc_ids[] =

{

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_2BD0),

	  (unsigned long) &hfc_map[0] },