Commit e9422e09 authored by Helge Deller's avatar Helge Deller Committed by Russell King

[SERIAL] 8250: constify some serial structs

- some const- ification and usage of ARRAY_SIZE() in serial drivers
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d21b55d3
...@@ -458,11 +458,11 @@ static int pci_siig_setup(struct serial_private *priv, ...@@ -458,11 +458,11 @@ static int pci_siig_setup(struct serial_private *priv,
* growing *huge*, we use this function to collapse some 70 entries * growing *huge*, we use this function to collapse some 70 entries
* in the PCI table into one, for sanity's and compactness's sake. * in the PCI table into one, for sanity's and compactness's sake.
*/ */
static unsigned short timedia_single_port[] = { static const unsigned short timedia_single_port[] = {
0x4025, 0x4027, 0x4028, 0x5025, 0x5027, 0 0x4025, 0x4027, 0x4028, 0x5025, 0x5027, 0
}; };
static unsigned short timedia_dual_port[] = { static const unsigned short timedia_dual_port[] = {
0x0002, 0x4036, 0x4037, 0x4038, 0x4078, 0x4079, 0x4085, 0x0002, 0x4036, 0x4037, 0x4038, 0x4078, 0x4079, 0x4085,
0x4088, 0x4089, 0x5037, 0x5078, 0x5079, 0x5085, 0x6079, 0x4088, 0x4089, 0x5037, 0x5078, 0x5079, 0x5085, 0x6079,
0x7079, 0x8079, 0x8137, 0x8138, 0x8237, 0x8238, 0x9079, 0x7079, 0x8079, 0x8137, 0x8138, 0x8237, 0x8238, 0x9079,
...@@ -470,35 +470,34 @@ static unsigned short timedia_dual_port[] = { ...@@ -470,35 +470,34 @@ static unsigned short timedia_dual_port[] = {
0xD079, 0 0xD079, 0
}; };
static unsigned short timedia_quad_port[] = { static const unsigned short timedia_quad_port[] = {
0x4055, 0x4056, 0x4095, 0x4096, 0x5056, 0x8156, 0x8157, 0x4055, 0x4056, 0x4095, 0x4096, 0x5056, 0x8156, 0x8157,
0x8256, 0x8257, 0x9056, 0x9156, 0x9157, 0x9158, 0x9159, 0x8256, 0x8257, 0x9056, 0x9156, 0x9157, 0x9158, 0x9159,
0x9256, 0x9257, 0xA056, 0xA157, 0xA158, 0xA159, 0xB056, 0x9256, 0x9257, 0xA056, 0xA157, 0xA158, 0xA159, 0xB056,
0xB157, 0 0xB157, 0
}; };
static unsigned short timedia_eight_port[] = { static const unsigned short timedia_eight_port[] = {
0x4065, 0x4066, 0x5065, 0x5066, 0x8166, 0x9066, 0x9166, 0x4065, 0x4066, 0x5065, 0x5066, 0x8166, 0x9066, 0x9166,
0x9167, 0x9168, 0xA066, 0xA167, 0xA168, 0 0x9167, 0x9168, 0xA066, 0xA167, 0xA168, 0
}; };
static const struct timedia_struct { static const struct timedia_struct {
int num; int num;
unsigned short *ids; const unsigned short *ids;
} timedia_data[] = { } timedia_data[] = {
{ 1, timedia_single_port }, { 1, timedia_single_port },
{ 2, timedia_dual_port }, { 2, timedia_dual_port },
{ 4, timedia_quad_port }, { 4, timedia_quad_port },
{ 8, timedia_eight_port }, { 8, timedia_eight_port }
{ 0, NULL }
}; };
static int pci_timedia_init(struct pci_dev *dev) static int pci_timedia_init(struct pci_dev *dev)
{ {
unsigned short *ids; const unsigned short *ids;
int i, j; int i, j;
for (i = 0; timedia_data[i].num; i++) { for (i = 0; i < ARRAY_SIZE(timedia_data); i++) {
ids = timedia_data[i].ids; ids = timedia_data[i].ids;
for (j = 0; ids[j]; j++) for (j = 0; ids[j]; j++)
if (dev->subsystem_device == ids[j]) if (dev->subsystem_device == ids[j])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment