aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-05-03 22:29:02 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2011-05-06 01:47:02 -0400
commit2202a5a7490a9de282846ea8d4a56d0249e09033 (patch)
tree1e785d4af7d478b39f264a99e0198336a72b37af /drivers/staging
parent25f8f54f6e178acfd503a95441b0ea05c525f751 (diff)
staging: pcmcia: Convert pcmcia_device_id declarations to const
Reduces data, increases text. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/cb_das16_cs.c2
-rw-r--r--drivers/staging/comedi/drivers/das08_cs.c2
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_700.c2
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_dio24.c2
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc_cs.c2
-rw-r--r--drivers/staging/comedi/drivers/ni_mio_cs.c2
-rw-r--r--drivers/staging/comedi/drivers/quatech_daqp_cs.c2
-rw-r--r--drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c2
-rw-r--r--drivers/staging/wlags49_h2/wl_cs.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index bb93685d8b93..8a1b8a7fa15f 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -772,7 +772,7 @@ static int das16cs_pcmcia_resume(struct pcmcia_device *link)
772 772
773/*====================================================================*/ 773/*====================================================================*/
774 774
775static struct pcmcia_device_id das16cs_id_table[] = { 775static const struct pcmcia_device_id das16cs_id_table[] = {
776 PCMCIA_DEVICE_MANF_CARD(0x01c5, 0x0039), 776 PCMCIA_DEVICE_MANF_CARD(0x01c5, 0x0039),
777 PCMCIA_DEVICE_MANF_CARD(0x01c5, 0x4009), 777 PCMCIA_DEVICE_MANF_CARD(0x01c5, 0x4009),
778 PCMCIA_DEVICE_NULL 778 PCMCIA_DEVICE_NULL
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index 0b32a2df7768..6d91d3028178 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -219,7 +219,7 @@ static int das08_pcmcia_resume(struct pcmcia_device *link)
219 219
220/*====================================================================*/ 220/*====================================================================*/
221 221
222static struct pcmcia_device_id das08_cs_id_table[] = { 222static const struct pcmcia_device_id das08_cs_id_table[] = {
223 PCMCIA_DEVICE_MANF_CARD(0x01c5, 0x4001), 223 PCMCIA_DEVICE_MANF_CARD(0x01c5, 0x4001),
224 PCMCIA_DEVICE_NULL 224 PCMCIA_DEVICE_NULL
225}; 225};
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 6b7372eed90d..2672629e9ff9 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -552,7 +552,7 @@ static int dio700_cs_resume(struct pcmcia_device *link)
552 552
553/*====================================================================*/ 553/*====================================================================*/
554 554
555static struct pcmcia_device_id dio700_cs_ids[] = { 555static const struct pcmcia_device_id dio700_cs_ids[] = {
556 /* N.B. These IDs should match those in dio700_boards */ 556 /* N.B. These IDs should match those in dio700_boards */
557 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x4743), /* daqcard-700 */ 557 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x4743), /* daqcard-700 */
558 PCMCIA_DEVICE_NULL 558 PCMCIA_DEVICE_NULL
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index c9c28584db67..49b824c7bd2e 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -304,7 +304,7 @@ static int dio24_cs_resume(struct pcmcia_device *link)
304 304
305/*====================================================================*/ 305/*====================================================================*/
306 306
307static struct pcmcia_device_id dio24_cs_ids[] = { 307static const struct pcmcia_device_id dio24_cs_ids[] = {
308 /* N.B. These IDs should match those in dio24_boards */ 308 /* N.B. These IDs should match those in dio24_boards */
309 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x475c), /* daqcard-dio24 */ 309 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x475c), /* daqcard-dio24 */
310 PCMCIA_DEVICE_NULL 310 PCMCIA_DEVICE_NULL
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 6facbc8bf776..832a5178b638 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -267,7 +267,7 @@ static int labpc_cs_resume(struct pcmcia_device *link)
267 return 0; 267 return 0;
268} /* labpc_cs_resume */ 268} /* labpc_cs_resume */
269 269
270static struct pcmcia_device_id labpc_cs_ids[] = { 270static const struct pcmcia_device_id labpc_cs_ids[] = {
271 /* N.B. These IDs should match those in labpc_cs_boards (ni_labpc.c) */ 271 /* N.B. These IDs should match those in labpc_cs_boards (ni_labpc.c) */
272 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0103), /* daqcard-1200 */ 272 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0103), /* daqcard-1200 */
273 PCMCIA_DEVICE_NULL 273 PCMCIA_DEVICE_NULL
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
index 49563273f605..53ec24bb6dce 100644
--- a/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -416,7 +416,7 @@ static int ni_getboardtype(struct comedi_device *dev,
416 416
417#ifdef MODULE 417#ifdef MODULE
418 418
419static struct pcmcia_device_id ni_mio_cs_ids[] = { 419static const struct pcmcia_device_id ni_mio_cs_ids[] = {
420 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010d), /* DAQCard-ai-16xe-50 */ 420 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010d), /* DAQCard-ai-16xe-50 */
421 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010c), /* DAQCard-ai-16e-4 */ 421 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010c), /* DAQCard-ai-16e-4 */
422 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x02c4), /* DAQCard-6062E */ 422 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x02c4), /* DAQCard-6062E */
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 82942e5728a5..e0bb73445dd8 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -1087,7 +1087,7 @@ static int daqp_cs_resume(struct pcmcia_device *link)
1087 1087
1088#ifdef MODULE 1088#ifdef MODULE
1089 1089
1090static struct pcmcia_device_id daqp_cs_id_table[] = { 1090static const struct pcmcia_device_id daqp_cs_id_table[] = {
1091 PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0027), 1091 PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0027),
1092 PCMCIA_DEVICE_NULL 1092 PCMCIA_DEVICE_NULL
1093}; 1093};
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
index 10af47700efb..68ea035635f4 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
@@ -284,7 +284,7 @@ static int ft1000_resume(struct pcmcia_device *link)
284 284
285/*====================================================================*/ 285/*====================================================================*/
286 286
287static struct pcmcia_device_id ft1000_ids[] = { 287static const struct pcmcia_device_id ft1000_ids[] = {
288 PCMCIA_DEVICE_MANF_CARD(0x02cc, 0x0100), 288 PCMCIA_DEVICE_MANF_CARD(0x02cc, 0x0100),
289 PCMCIA_DEVICE_MANF_CARD(0x02cc, 0x1000), 289 PCMCIA_DEVICE_MANF_CARD(0x02cc, 0x1000),
290 PCMCIA_DEVICE_MANF_CARD(0x02cc, 0x1300), 290 PCMCIA_DEVICE_MANF_CARD(0x02cc, 0x1300),
diff --git a/drivers/staging/wlags49_h2/wl_cs.c b/drivers/staging/wlags49_h2/wl_cs.c
index 6555891e149c..a3a727c3b40f 100644
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@ -378,7 +378,7 @@ int wl_adapter_close(struct net_device *dev)
378} /* wl_adapter_close */ 378} /* wl_adapter_close */
379/*============================================================================*/ 379/*============================================================================*/
380 380
381static struct pcmcia_device_id wl_adapter_ids[] = { 381static const struct pcmcia_device_id wl_adapter_ids[] = {
382#if !((HCF_TYPE) & HCF_TYPE_HII5) 382#if !((HCF_TYPE) & HCF_TYPE_HII5)
383 PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0003), 383 PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0003),
384 PCMCIA_DEVICE_PROD_ID12("Agere Systems", "Wireless PC Card Model 0110", 384 PCMCIA_DEVICE_PROD_ID12("Agere Systems", "Wireless PC Card Model 0110",